Teejoon 46eaedb186 Merge remote-tracking branch 'origin/master' into Importer ...

Conflicts:
	resources/Schema/Entities/Player.xml
	src/Engine/Collision/CollisionSystem.cpp
	src/Engine/Rendering/DrawFinalPass.cpp

2016-03-02 13:19:40 +01:00

..

Weapon

WIP multi-weapon behaviours

2016-02-29 06:58:57 +01:00

AmmoPickupSystem.cpp

AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that

2016-03-01 17:55:00 +01:00

AmmunitionHUDSystem.cpp

AmmunitionHUDSystem now really working

2016-02-12 00:26:59 +01:00

CapturePointHUDSystem.cpp

Merge branch 'master' of github.com:teamfisk/TacticalZ

2016-02-12 02:47:12 +01:00

CapturePointSystem.cpp

Removed DebugCode

2016-03-01 17:37:30 +01:00

DamageIndicatorSystem.cpp

WIP multi-weapon behaviours

2016-02-29 06:58:57 +01:00

ExplosionEffectSystem.cpp

Major networking refactoring to allow for snapshot filtering outside of netcode

2016-02-09 13:22:21 +01:00

HealthHUDSystem.cpp

Fixed Health text color

2016-02-12 02:38:11 +01:00

HealthSystem.cpp

added extra check in HealthSystem

2016-02-19 16:37:26 +01:00

InterpolationSystem.cpp

Working 1-snapshot interpolation

2016-02-09 19:36:22 +01:00

KillFeedSystem.cpp

Fixed size

2016-02-12 05:45:17 +01:00

LifetimeSystem.cpp

Weapon RayZ

2016-01-25 11:26:33 +01:00

PickupSpawnSystem.cpp

AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that

2016-03-01 17:55:00 +01:00

PlayerDeathSystem.cpp

CapturePointSystem fix, DamageIndicatorSystem fix

2016-02-23 17:29:33 +01:00

PlayerMovementSystem.cpp

Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings

2016-03-01 17:57:18 +01:00

PlayerSpawnSystem.cpp

Check so CapturePointGameMode pool exists and has a size.

2016-03-01 10:20:52 +01:00

SoundSystem.cpp

ECaptured: added NextCapturePoint entitywrapper. Changed CapturePointID to CapturePointTakenID. Fixed so CapturePoints works in singleplayer again. Captured event is now sent in the next Update, since the information for NextCapturePoint is needed

2016-03-01 17:34:30 +01:00

SpawnerSystem.cpp

Merge remote-tracking branch 'origin/master' into Importer

2016-03-02 13:19:40 +01:00