viktorljung d1c11f20f2 Merge remote-tracking branch 'origin/master' into Movement

2016-03-14 00:39:16 +01:00

..

Weapon

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

2016-03-14 00:39:16 +01:00

AbilityCooldownHUDSystem.cpp

Merge fixes

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

AmmoPickupSystem.cpp

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

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

BoostIconsHUDSystem.cpp

Merge fixes

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

BoostSystem.cpp

ammo share fix?

2016-03-13 20:32:08 +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

Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

2016-03-13 14:23:56 +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

EndScreenSystem.cpp

Merge fixes

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

ExplosionEffectSystem.cpp

Merge branch 'master' into Dirtybit

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

FadeSystem.cpp

Small fix

2016-03-13 17:33:12 +01:00

HealthHUDSystem.cpp

Now it works

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

HealthSystem.cpp

hp fixed?

2016-03-13 21:19:21 +01:00

InterpolationSystem.cpp

Updated the ENTIRE CODEBASE TO MATCH

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

KillFeedSystem.cpp

Killfeed should work now.

2016-03-13 21:01:04 +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

hp really fixed?

2016-03-13 21:24:27 +01:00

PlayerDeathSystem.cpp

EEntityDeleted now provides an EntityWrapper instead of just an ID

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

PlayerMovementSystem.cpp

fix???

2016-03-13 20:58:53 +01:00

PlayerSpawnSystem.cpp

Player is now spawned as the correct class that they picked.

2016-03-13 23:05:52 +01:00

ScoreScreenSystem.cpp

Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

2016-03-13 14:23:56 +01:00

ServerListSystem.cpp

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

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

SoundSystem.cpp

Now listens to SetCamera event and the background music should be working properly.

2016-03-13 17:35:05 +01:00

SpawnerSystem.cpp

Player is now spawned as the correct class that they picked.

2016-03-13 23:05:52 +01:00

SpectatorCameraSystem.cpp

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

2016-03-13 19:54:22 +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