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

Conflicts: src/game/Game/ProjectileSystem.cpp
2015-10-22 11:18:35 +02:00
parent 091895cc85 83f4da59d4
commit 0f687a4ba5
135 changed files with 13746 additions and 4770 deletions
@@ -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