Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/plane.obj
This commit is contained in:
ViktorLjung
2014-03-13 02:02:41 +01:00
17 changed files with 314 additions and 64 deletions
@@ -1,12 +0,0 @@
# Blender MTL File: 'obstaclesandstuff.blend'
# Material Count: 1
newmtl Material
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.559600 0.559600 0.559600
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2
map_Kd ObstacleTexture.png
@@ -1,12 +0,0 @@
# Blender MTL File: 'obstaclesandstuff.blend'
# Material Count: 1
newmtl Material
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.559600 0.559600 0.559600
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2
map_Kd ObstacleTexture.png