William Moberg 46ae2d39af Merge branch 'master' into OctTree ...

# Conflicts:
#	src/Game/Game.cpp

2015-12-17 16:44:01 +01:00

..

EditorTestWorld.xml

Working rotations and translations relative to global and local space for children

2015-12-16 17:20:56 +01:00

OtherEntity.xml

Updated schema with custom type names to better match their C++ counterparts

2015-11-26 16:09:11 +01:00

Test.xml

Very simple CollisionSystem made, 'Z','Y' to toggle on/off.

2015-12-15 15:36:28 +01:00