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

Conflicts: include/Core/Engine.h src/game/CMakeLists.txt
2015-09-14 14:54:41 +02:00
parent ed5881ec54 1b9da2de1b
commit 760574f454
244 changed files with 53871 additions and 87 deletions
@@ -0,0 +1,12 @@
+o Plane
+v -0.5 -0.5 0.0
+v 0.5 -0.5 0.0
+v -0.5 0.5 0.0
+v 0.5 0.5 0.0
+vt 0 0
+vt 1 0
+vt 1 1
+vt 0 1
+vn 0 0 1
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1