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.h

ShiftIcon should now track ability depending on what ability the player has and change icon accordingly.

2016-03-07 13:55:37 +01:00

AmmoPickupSystem.h

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

BoostIconsHUDSystem.h

BoostIcons should now track correctly

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

BoostSystem.h

Ammosharing over network test WIP

2016-03-12 17:01:46 +01:00

CapturePointArrowHUDSystem.h

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.h

Arrow should now track the CapturePoint specified in the Component.

2016-03-01 20:31:09 +01:00

CapturePointSystem.h

The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.

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

DamageIndicatorSystem.h

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.h

EndScreen should now show when a team win

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

ExplosionEffectSystem.h

Redid many a thing for the sake of efficiency

2016-02-23 10:06:21 +01:00

FadeSystem.h

Fade in/out should now work with models and sprites

2016-03-13 02:03:49 +01:00

FloatingEffectSystem.h

Updated the ENTIRE CODEBASE TO MATCH

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

HealthHUDSystem.h

AmmunitionHUD now working

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

HealthSystem.h

Moved menu code into GUI

2016-02-17 13:44:11 +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

BoneAttachments now working and BlendTrees are created in the AnimationSystem

2016-02-26 10:17:47 +01:00

MainMenuSystem.h

Resolution should now use a dropdown

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

PickupSpawnSystem.h

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

PlayerDeathSystem.h

Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.

2016-03-08 18:26:17 +01:00

PlayerMovementSystem.h

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

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

PlayerSpawnSystem.h

Class enum instead of hardcoded ints.

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

RaptorCopterSystem.h

fixup! Cheeki breeki

2016-03-13 01:32:29 +01:00

ScoreScreenSystem.h

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.h

Servers now show up in the server list.

2016-03-08 18:13:21 +01:00

SoundSystem.h

Added menu music

2016-03-11 20:28:09 +01:00

SpawnerSystem.h

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.h

The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.

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

StartSystem.h

Rename variable

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

TextFieldReader.h

double's should now be displayed with only 1 decimal.

2016-03-04 02:19:13 +01:00