BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/Physics/PhysicsSystem.h
	src/game/Physics/PhysicsSystem.cpp
This commit is contained in:
viktorljung
2015-10-01 14:13:51 +02:00
parent cbaca42a3c cc1bc25914
commit 39f4215c2b
20 changed files with 166 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Models/submarine2.mtl → assets/Models/Submarine2.mtl
View File
assets/Models/submarine2.obj → assets/Models/Submarine2.obj
+1 -1
View File
@@ -1,6 +1,6 @@
# Blender v2.75 (sub 0) OBJ File: 'submarine.blend'
# www.blender.org
mtllib submarine2.mtl
mtllib Submarine2.mtl
o Cube
v -0.378953 -0.002680 -0.065172
v 0.212611 0.044805 -0.044067