Jace 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem ...

# Conflicts:
#	include/Engine/Collision/FillFrustumOctreeSystem.h
#	include/Engine/Core/Octree.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/DefaultInput.ini
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp

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

..

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

ExplosionEffectSystem.h

Major networking refactoring to allow for snapshot filtering outside of netcode

2016-02-09 13:22:21 +01:00

HealthSystem.h

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

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

InterpolationSystem.h

Working 1-snapshot interpolation

2016-02-09 19:36:22 +01:00

LifetimeSystem.h

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

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

PickupSpawnSystem.h

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

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

PlayerDeathSystem.h

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

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

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

PlayerMovementSystem.h

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

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

PlayerSpawnSystem.h

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

2016-02-10 17:02:00 +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

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

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

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

WeaponSystem.h

WIP

2016-02-10 14:43:32 +01:00