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

Conflicts:
	include/Core/Engine.h
This commit is contained in:
PlatinumSkink
2015-09-10 22:44:44 +02:00
194 changed files with 52498 additions and 34 deletions
+12
View File
@@ -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