 verysecrethero
|
3301f66ad1
|
Merge remote-tracking branch 'origin/master' into DamageIndicator
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
|
2016-02-11 16:36:48 +01:00 |
|
 Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
|
Jace
|
d931660c56
|
WIP
|
2016-02-10 14:43:32 +01:00 |
|
|
Jace
|
5cea3bed3a
|
Work in progress weapon system
|
2016-02-09 23:27:04 +01:00 |
|
|
Jace
|
d83190290f
|
Server now broadcasts certain input commands to all other clients (for stuff like shooting)
|
2016-02-09 19:37:42 +01:00 |
|
|
verysecrethero
|
8bdf87da12
|
Some cleanup of the code
|
2016-02-09 16:15:19 +01:00 |
|
|
Jace
|
2b4e00e4b0
|
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
|
2016-02-08 13:33:55 +01:00 |
|
|
Jace
|
a22bc00d46
|
*cough*
|
2016-02-01 13:37:51 +01:00 |
|
|
Jace
|
0334ec3fa7
|
Merge remote-tracking branch 'origin/Animations'
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
|
2016-01-27 13:36:49 +01:00 |
|
|
Jace
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
 viktorljung
|
d12246833e
|
Some further small fizes to resolution //Tobias
|
2016-01-25 01:26:41 +01:00 |
|
|
Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +01:00 |
|
|
Jace
|
b4081b3e45
|
Merge remote-tracking branch 'origin/Networking'
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
|
2016-01-24 18:36:37 +01:00 |
|
|
Jace
|
235b26ad61
|
WIP shoot
|
2016-01-24 17:16:18 +01:00 |
|
 Jocke
|
7567f47a68
|
Weapon system now searches parents for health component (stops at first health component).
|
2016-01-24 11:56:46 +01:00 |
|
|
Jocke
|
97d70f8e32
|
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
|
2016-01-24 11:36:01 +01:00 |
|
|
verysecrethero
|
deb6ff1b16
|
Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)
|
2016-01-21 17:36:47 +01:00 |
|
|
verysecrethero
|
973ccd34c9
|
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
|
2016-01-21 16:30:07 +01:00 |
|
|
verysecrethero
|
7deb32431e
|
Removed Color TestCode in WeaponSystem
|
2016-01-21 16:03:30 +01:00 |
|
|
verysecrethero
|
bdebc9de62
|
WeaponSystem now handles "PrimaryFire" input events. It sends out ePlayerDamage event if it hits a player. Included some tests
|
2016-01-21 11:55:51 +01:00 |
|