4 Commits

Author	SHA1	Message	Date
viktorljung	c09c2f4783	Merge remote-tracking branch 'origin/Importer' into Animations ... # Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/RenderingWorld.xml # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/Skeleton.cpp	2016-02-09 22:50:19 +01:00
Teejoon	060e674a6f	Picking supports skinned meshes	2016-02-08 17:37:18 +01:00
viktorljung	51075aefc8	Model that has animations is now visible when it does not play an animation (T-pose)	2016-02-01 10:24:50 +01:00
antc13	96a735c542	Changed .obj to .mesh for all meshes.	2016-01-24 16:12:31 +01:00