Jace 95f9065037 Merge branch 'master' into Dirtybit ...

# Conflicts:
#	include/Engine/Sound/SoundManager.h

2016-03-13 01:07:17 +01:00

..

Weapon

Merge branch 'master' into Dirtybit

2016-03-13 01:07:17 +01:00

AbilityCooldownHUDSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

AmmoPickupSystem.cpp

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

2016-03-12 04:09:53 +01:00

BoostIconsHUDSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

BoostSystem.cpp

Should now work fully, not KD tho

2016-03-04 01:34:29 +01:00

CapturePointArrowHUDSystem.cpp

Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself

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

CapturePointHUDSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

CapturePointSystem.cpp

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

2016-03-12 04:09:53 +01:00

DamageIndicatorSystem.cpp

Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself

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

ExplosionEffectSystem.cpp

Merge branch 'master' into Dirtybit

2016-03-12 17:59:50 +01:00

HealthHUDSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

HealthSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

InterpolationSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

KillFeedSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

LifetimeSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

MainMenuSystem.cpp

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

PickupSpawnSystem.cpp

Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed

2016-03-07 17:16:18 +01:00

PlayerDeathSystem.cpp

EEntityDeleted now provides an EntityWrapper instead of just an ID

2016-03-13 00:16:07 +01:00

PlayerMovementSystem.cpp

Merge branch 'master' into Dirtybit

2016-03-13 01:07:17 +01:00

PlayerSpawnSystem.cpp

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

2016-03-12 04:09:53 +01:00

ScoreScreenSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +01:00

ServerListSystem.cpp

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

2016-03-12 04:09:53 +01:00

SoundSystem.cpp

playerJump is only done for local player.

2016-03-12 17:51:06 +01:00

SpawnerSystem.cpp

Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself

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

SpectatorCameraSystem.cpp

Mouse always unlocked on game start and on disconnecting (i.e when menu shows).

2016-03-10 12:46:06 +01:00

StartSystem.cpp

Rename variable

2016-03-09 17:37:40 +01:00

TextFieldReader.cpp

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

2016-03-12 04:09:53 +01:00