3 Commits

Author	SHA1	Message	Date
viktorljung	af034673f6	BoneAttachments now working and BlendTrees are created in the AnimationSystem	2016-02-26 10:17:47 +01:00
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
viktorljung	8fc8d56ee1	Added BoneAttachment component	2016-01-27 17:14:16 +01:00