 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 |
|
|
Jace
|
cfe023cc1d
|
Created ComponentInfo::EnumType which defines which native type to use for enums.
|
2016-01-19 12:33:53 +01:00 |
|
 verysecrethero
|
4c1a49a8a4
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/CMakeLists.txt
# src/Game/PlayerSystem.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestGameMain.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
|
2016-01-18 16:48:49 +01:00 |
|
|
Jace
|
6385a98eca
|
Added runtime type size check to ComponentWrapper to avoid corruption when types don't match
|
2016-01-17 00:59:26 +01:00 |
|
|
Jace
|
d8a24bbfde
|
Renamed all instances of "Property" to "Field" in ComponentWrapper to maintain consistent naming with ComponentInfo
|
2016-01-17 00:38:25 +01:00 |
|
|
Jace
|
9ec32464bc
|
Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime.
|
2016-01-16 23:12:24 +01:00 |
|
|
verysecrethero
|
4b672b11e7
|
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
|
2016-01-13 15:58:52 +01:00 |
|
|
Jace
|
24b9e951c2
|
Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it.
|
2016-01-11 14:35:41 +01:00 |
|
 sippeangelo
|
d7de4fc694
|
Component definitions now loaded from schema. No default values yet.
|
2015-12-08 18:07:32 +01:00 |
|
|
sippeangelo
|
aeb6c39603
|
Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful
|
2015-12-03 19:31:55 +01:00 |
|
|
sippeangelo
|
d3d2e594fe
|
Basic and working entity system with a really ugly test case
|
2015-12-03 15:07:35 +01:00 |
|
|
sippeangelo
|
c7430a9338
|
Fixed ComponentWrapper string scope error
|
2015-12-02 15:37:20 +01:00 |
|
|
sippeangelo
|
b3e68c6c34
|
Implemented ComponentPool and initial tests for it
|
2015-12-02 15:07:48 +01:00 |
|