stiffly 50822d09fc Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	src/Game/Game.cpp

2015-12-17 14:10:02 +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

Merge remote-tracking branch 'origin/master' into Networking

2015-12-14 17:07:12 +01:00