 William Moberg
|
90f05442aa
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
|
2016-01-27 10:52:27 +01:00 |
|
 antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
William Moberg
|
6eeb3ea524
|
WIP, Bug fix + nitpicks + optimizations.
|
2016-01-23 17:50:35 +01:00 |
|
|
William Moberg
|
71404c8828
|
Special case for collision vs ground (upward facing) triangles.
|
2016-01-23 14:01:54 +01:00 |
|
|
William Moberg
|
a58cc33ed0
|
WIP, multithreaded loading based on exceptions, very slow probably.
|
2016-01-13 10:58:31 +01:00 |
|
|
William Moberg
|
0f59b863ee
|
Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models.
|
2015-12-17 17:08:47 +01:00 |
|