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

2015-10-19 13:37:10 +02:00
parent c5d88301ad 116cfb5759
commit 3fb741335e
47 changed files with 17173 additions and 905 deletions
@@ -0,0 +1,12 @@
+[Debug]
+SkipStory=false
+LogLevel=1
+
+[Audio]
+SFXVolume=0.5
+BGMVolume=0.5
+
+[Video]
+Fullscreen=false
+Width=675
+Height=1080
@@ -0,0 +1,12 @@
+# Blender MTL File: 'Arm.blend'
+# Material Count: 1
+
+newmtl Material
+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 texture.png