 William Moberg
|
e3a44d37d2
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-05 14:59:14 +01:00 |
|
 verysecrethero
|
42b52a6766
|
Several changes/fixes based on the latest broken refactoring.
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
|
2016-02-02 11:37:22 +01:00 |
|
|
William Moberg
|
d7b02e79c8
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Collision/CollisionSystem.h
# src/Engine/Collision/CollisionSystem.cpp
|
2016-02-01 13:48:05 +01:00 |
|
 Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
William Moberg
|
3974c649ab
|
WIP on ModelBoxCollision. Octree works in Release mode.
|
2016-01-23 10:45:50 +01:00 |
|
|
Jace
|
3ac3311c0c
|
"inline" caused missing symbol when compiling in Release for some reason
|
2016-01-23 00:38:11 +01:00 |
|
|
William Moberg
|
713ebbe18c
|
Can add any objects that inherit from AABB into the Octree.
|
2016-01-19 14:50:46 +01:00 |
|
|
Jace
|
d6ef527f25
|
Basic collisions using Octree. Seems buggy over octree boundaries.
|
2016-01-13 15:34:43 +01:00 |
|
|
Jace
|
8ed4ba1219
|
Added missing include for Octree
|
2016-01-13 12:16:35 +01:00 |
|
|
Jace
|
311475cbb6
|
Renamed all OctTree to Octree (More OCD)
|
2016-01-13 12:15:36 +01:00 |
|
|
Jace
|
8164a955d6
|
Renamed OctTree files to Octree (OCD to the max)
|
2016-01-13 12:15:09 +01:00 |
|