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

Conflicts: Escape-the-Dawn/Systems/LevelGenerationSystem.cpp Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 19:36:03 +01:00
parent 36069b2c3b 235e9648ad
commit 01f2ebfa20
23 changed files with 304 additions and 166 deletions
@@ -0,0 +1,12 @@
+# Blender MTL File: 'powerup.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd powerupTexture.png