 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 |
|
 verysecrethero
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +01:00 |
|
|
Jace
|
3fc44e944c
|
Editor entity reparenting.
|
2016-01-18 21:20:20 +01:00 |
|
 William Moberg
|
99b76d7ae1
|
Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s.
|
2015-12-16 12:19:43 +01:00 |
|
|
Jace
|
91ace0d2a0
|
Fixed bug in ComponentPool::Delete. Wasn't taking EntityID into account when freeing memory.
|
2015-12-14 13:57:53 +01:00 |
|
|
Jace
|
2018ba27ae
|
Added KnowsEntity function to ComponentPool to query whether an entity has a component attached
|
2015-12-14 13:57:52 +01:00 |
|
 sippeangelo
|
d3d2e594fe
|
Basic and working entity system with a really ugly test case
|
2015-12-03 15:07:35 +01:00 |
|