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

..

CollidableOctreeSystem.cpp

Changed System to take World through constructor and store it instead, cause it makes more sense.

2016-01-18 23:59:33 +01:00

Collision.cpp

Tried a horrible recursive method, extreme framedrop.

2016-01-27 10:34:26 +01:00

CollisionSystem.cpp

Merge branch 'master' into BoxModelCollision

2016-01-27 10:52:27 +01:00

TriggerSystem.cpp

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

2016-01-21 16:16:35 +01:00