William Moberg 04a01104b5 Merge branch 'master' into OctTree ...

# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp

2015-12-15 17:11:11 +01:00

..

EditorTestWorld.xml

Editor version 1

2015-12-14 13:57:55 +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