William Moberg 97b915f130 Merge branch 'master' into Respawning ...

# Conflicts:
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/SoundSystem.cpp

2016-02-11 16:15:47 +01:00

..

CapturePointHUDSystem.h

Fixed depth sorting for HUD elements.

2016-02-11 15:27:07 +01:00

CapturePointSystem.h

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

ExplosionEffectSystem.h

Major networking refactoring to allow for snapshot filtering outside of netcode

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

HealthSystem.h

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

2016-02-10 17:02:00 +01:00

InterpolationSystem.h

Working 1-snapshot interpolation

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

LifetimeSystem.h

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

2016-02-10 17:02:00 +01:00

PickupSpawnSystem.h

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

2016-02-10 17:02:00 +01:00

PlayerDeathSystem.h

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

2016-02-10 17:02:00 +01:00

PlayerHUDSystem.h

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

PlayerMovementSystem.h

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

2016-02-11 15:19:01 +01:00

PlayerSpawnSystem.h

Merge branch 'master' into Respawning

2016-02-11 16:15:47 +01:00

RaptorCopterSystem.h

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

SoundSystem.h

Protected inheritance, not even once.

2016-02-11 11:36:39 +01:00

SpawnerSystem.h

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

WeaponSystem.h

Protected inheritance, not even once.

2016-02-11 11:36:39 +01:00