stiffly 1cdcbf9b32 Merge remote-tracking branch 'origin/master' into Sound ...

# Conflicts:
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

2016-02-12 08:19:29 +01:00

..

Weapon

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

2016-02-12 08:19:29 +01:00

AmmoPickupSystem.h

Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.

2016-02-11 23:56:40 +01:00

AmmunitionHUDSystem.h

AmmunitionHUDSystem now really working

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

CapturePointHUDSystem.h

Fixed depth sorting for HUD elements.

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

CapturePointSystem.h

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

2016-02-11 16:09:05 +01:00

DamageIndicatorSystem.h

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

2016-02-11 23:44:20 +01:00

ExplosionEffectSystem.h

Major networking refactoring to allow for snapshot filtering outside of netcode

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

HealthHUDSystem.h

AmmunitionHUD now working

2016-02-11 23:38:25 +01:00

HealthSystem.h

Complete blue and red player entities

2016-02-12 07:45:51 +01:00

InterpolationSystem.h

Working 1-snapshot interpolation

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

KillFeedSystem.h

KillFeed

2016-02-12 05:41:05 +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

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