William Moberg 9f6fa40448 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Engine/Collision/CollisionSystem.cpp

2016-01-21 17:16:55 +01:00

..

CollidableOctreeSystem.h

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

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

Collision.h

WIP, collision detects too much, no resolving for most cases.

2016-01-21 17:10:36 +01:00

CollisionSystem.h

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

2016-01-21 16:16:35 +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