viktorljung 5c3b472a4d Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Engine/Rendering/Skeleton.cpp

2016-02-26 10:21:22 +01:00

..

Weapon

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

2016-02-12 08:19:29 +01:00

AmmoPickupSystem.h

Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling

2016-02-24 17:53:37 +01:00

AmmunitionHUDSystem.h

AmmunitionHUDSystem now really working

2016-02-12 00:26:59 +01:00

CapturePointHUDSystem.h

Fixed depth sorting for HUD elements.

2016-02-11 15:27:07 +01:00

CapturePointSystem.h

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

2016-02-11 16:09:05 +01:00

DamageIndicatorSystem.h

now using a define INDICATOR_TEST to activate the DamageIndicatorSystem test.

2016-02-24 13:58:05 +01:00

ExplosionEffectSystem.h

Major networking refactoring to allow for snapshot filtering outside of netcode

2016-02-09 13:22:21 +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

PickupSpawnSystem.h

Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling

2016-02-24 17:53:37 +01:00

PlayerDeathSystem.h

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

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

PlayerMovementSystem.h

Fixed typo m_EPDoubleJump to m_EDoubleJump.

2016-02-25 16:04:27 +01:00

PlayerSpawnSystem.h

Merge branch 'master' into Respawning

2016-02-11 16:15:47 +01:00

RaptorCopterSystem.h

Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

2016-02-08 13:33:55 +01:00

SoundSystem.h

Protected inheritance, not even once.

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

SpawnerSystem.h

Cannot respawn inside other players, unless all are blocked.

2016-02-17 14:54:59 +01:00