3 Commits

Author	SHA1	Message	Date
Jace	a6548a72b3	Merge remote-tracking branch 'origin/master' into EditorUsefulness ... # Conflicts: # include/Engine/Collision/CollidableOctreeSystem.h # include/Engine/Collision/CollisionSystem.h # include/Engine/Collision/TriggerSystem.h # include/Engine/Rendering/RenderSystem.h # include/Game/Systems/PlayerSystem.h # resources/Schema/Components/Physics.xsd # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp # src/Game/Systems/HealthSystem.cpp # src/Game/Systems/PlayerSystem.cpp # src/Tests/OctTreeTestGameClass.cpp	2016-01-21 16:16:35 +01:00
stiffly	ad9bb5fba4	Added an extra interpolation point.	2016-01-19 15:03:10 +01:00
stiffly	e0c4394f20	Merge. Also fixed interpolation for scale and rotation. ... Merge remote-tracking branch 'origin/master' into Networking # Conflicts: # include/Game/Game.h # src/Game/CMakeLists.txt # src/Game/Game.cpp	2016-01-19 14:04:25 +01:00