Merge branch 'master' into OctTree

# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2015-12-17 16:44:01 +01:00
15 changed files with 423 additions and 59 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
<c:Transform>
<Position X="0" Y="0" Z="0"/>
<Orientation X="0" Y="0" Z="0" W="0"/>
<Orientation X="0" Y="0" Z="0"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>