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

Merge branch 'master' into BoxModelCollision

Browse Source 
# Conflicts:
#	include/Engine/Core/Octree.h
#	resources/Schema/Entities/CollisionTestLevel.xml
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Core/Octree.cpp
This commit is contained in:
William Moberg
2016-01-27 10:52:27 +01:00
parent 6ea490e215 505a6c7396
commit 90f05442aa
145 changed files with 6062 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/CollisionTestLevel.xml
+3 -3
View File
@@ -11,7 +11,7 @@
<c:AABB/>
<c:Collidable/>
<c:Model>
<Resource>../assets\Models\Test/ObstacleCourse.obj</Resource>
<Resource>../assets/Models/Test/ObstacleCourse.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="0" Z="0.00638055196"/>
@@ -35,7 +35,7 @@
<c:AABB/>
<c:Collidable/>
<c:Model>
<Resource>../assets\Models\Core\UnitCube.obj</Resource>
<Resource>../assets/Models/Core/UnitCube.mesh</Resource>
</c:Model>
<c:Physics>
<Gravity>false</Gravity>
@@ -53,7 +53,7 @@
<c:AABB/>
<c:Collidable/>
<c:Model>
<Resource>../assets\Models\Core\colorbox.obj</Resource>
<Resource>../assets/Models/Core/colorbox.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="-1.52309108" Y="5.72108126" Z="0"/>