viktorljung 44f46cda8d Merge remote-tracking branch 'origin/master' into Movement ...

# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CP_Rocky2.xml
#	resources/Schema/Entities/MuzzleFlashBlue.xml
#	resources/Schema/Entities/MuzzleFlashFire.xml
#	resources/Schema/Entities/MuzzleFlashRed.xml
#	resources/Schema/Types/Entity.xsd
#	resources/Shaders/Sprite.frag.glsl
#	src/Game/Systems/AbilityCooldownHUDSystem.cpp
#	src/Game/Systems/BoostIconsHUDSystem.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

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

..

Weapon

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

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

AbilityCooldownHUDSystem.cpp

Player HUD should now be ok, color of health still shit tho

2016-03-12 14:37:26 +01:00

AmmoPickupSystem.cpp

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

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

BoostIconsHUDSystem.cpp

Boost icon fix

2016-03-12 17:30:28 +01:00

BoostSystem.cpp

Ammo sharing done

2016-03-12 18:29:49 +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

Boost icon fix

2016-03-12 17:30:28 +01:00

ExplosionEffectSystem.cpp

Merge branch 'master' into Dirtybit

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

FadeSystem.cpp

Muzzleflash now very nice

2016-03-13 02:25:11 +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 remote-tracking branch 'origin/master' into Movement

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

PlayerSpawnSystem.cpp

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

2016-03-12 04:09:53 +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

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

Scoreboard is now works.

2016-03-12 19:36:12 +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