 Jace
|
788407b709
|
Made CollisionSystem aware of entities
|
2016-01-27 15:42:50 +01:00 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +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
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
William Moberg
|
0669d91767
|
CollisionSystem loops over Collidable components.
|
2016-01-18 13:29:10 +01:00 |
|
|
Jace
|
d34470256b
|
EntityWrapper to uniquely identify entities and make using them a little easier
|
2016-01-14 15:43:19 +01:00 |
|
|
Jace
|
d6ef527f25
|
Basic collisions using Octree. Seems buggy over octree boundaries.
|
2016-01-13 15:34:43 +01:00 |
|
|
William Moberg
|
cf0ff9bfe5
|
Simple quickly made CollisionSystem.
|
2015-12-16 12:23:08 +01:00 |
|
|
William Moberg
|
e2417be8c7
|
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
|
2015-12-15 15:36:28 +01:00 |
|
|
William Moberg
|
59095c2ce5
|
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
|
2015-12-14 17:08:00 +01:00 |
|