Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp

2016-03-03 13:22:28 +01:00

..

Weapon

DefenderWeapon and SidearmWeapon

2016-03-03 01:13:39 +01:00

AbilityCooldownHUDSystem.cpp

Some fixes to the Player and map, added skeleton system for the ScoreScreen

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

AmmoPickupSystem.cpp

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

BoostIconsHUDSystem.cpp

BoostIcons should now track correctly

2016-03-02 18:13:09 +01:00

BoostSystem.cpp

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

CapturePointArrowHUDSystem.cpp

Should now correctly track if another player takes your last capture point

2016-03-02 13:56:35 +01:00

CapturePointHUDSystem.cpp

WIP

2016-03-03 12:58:35 +01:00

CapturePointSystem.cpp

Removed comment

2016-03-02 16:47:30 +01:00

DamageIndicatorSystem.cpp

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +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

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

2016-03-02 15:59:16 +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

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

PlayerDeathSystem.cpp

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

PlayerMovementSystem.cpp

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

PlayerSpawnSystem.cpp

Respawn time now only displays numbers, centered below CPHUD.

2016-03-02 16:45:43 +01:00

ScoreScreenSystem.cpp

WIP

2016-03-03 12:58:35 +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

Made SpawnerSystem utilize the new EntityFile for spawning instead

2016-03-02 19:52:34 +01:00

TextFieldReader.cpp

Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value!

2016-03-03 01:35:32 +01:00