William Moberg a3b3351e55 Merge branch 'master' into Dirtybit ...

# Conflicts:
#	include/Engine/Rendering/ExplosionEffectJob.h
#	src/Game/Systems/ExplosionEffectSystem.cpp

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

..

Weapon

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

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

GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all

2016-03-08 16:33:08 +01:00

BoostIconsHUDSystem.h

BoostIcons should now track correctly

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

BoostSystem.h

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

The arrow should now track CapturePoints correctly at start and when they are captured.

2016-03-01 21:57:30 +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 children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1

2016-03-10 14:38:20 +01:00

DamageIndicatorSystem.h

DamageIndicatorSystem now works for singleplayer again. Friendly fire DamageIndicator is now black color.

2016-03-08 15:55:51 +01:00

ExplosionEffectSystem.h

Redid many a thing for the sake of efficiency

2016-02-23 10:06:21 +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

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

Added a afterimage SprintEffect for the Sniper.

2016-03-03 21:24:31 +01:00

PlayerSpawnSystem.h

Class enum instead of hardcoded ints.

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

RaptorCopterSystem.h

Updated the ENTIRE CODEBASE TO MATCH

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

ScoreScreenSystem.h

Fixes

2016-03-04 02:52:04 +01:00

ServerListSystem.h

Servers now show up in the server list.

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

SoundSystem.h

Protected inheritance, not even once.

2016-02-11 11:36:39 +01:00

SpawnerSystem.h

Made SpawnerSystem utilize the new EntityFile for spawning instead

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

SpectatorCameraSystem.h

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

2016-03-10 12:46:06 +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