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

..

Events

Added dash sound

2016-02-05 16:37:56 +01:00

Network

Major networking refactoring to allow for snapshot filtering outside of netcode

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

Systems

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

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

Game.h

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

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