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.h

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

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

Collision.h

Merge branch 'master' into BoxModelCollision

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

CollisionSystem.h

WIP on ModelBoxCollision. Octree works in Release mode.

2016-01-23 10:45:50 +01:00

ETrigger.h

Fixed comment on Trigger events.

2015-12-17 13:48:35 +01:00

TriggerSystem.h

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

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