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

2015-10-21 15:40:43 +02:00
parent f4ffead4f2 17c30ff610
commit f41e126bd6
132 changed files with 11918 additions and 4270 deletions
@@ -9,4 +9,4 @@ BGMVolume=0.5
 [Video]
 Fullscreen=false
 Width=675
-Height=1080[Water]Radius=0.3[Cheat]GodMode=false
+Height=1080[Water]Radius=0.3[Cheat]GodMode=false[Water]Radius=0.3[Cheat]GodMode=false
@@ -1,12 +0,0 @@
-# Blender MTL File: 'submarine.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 SubmarineTexture.png
@@ -1,12 +0,0 @@
-# Blender MTL File: 'submarine.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 SubmarineTexture.png