 verysecrethero
|
b098bd2bd3
|
Merge remote-tracking branch 'origin/master' into ShootEvent
# 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/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
|
2016-01-20 17:53:33 +01:00 |
|
 Jace
|
f65ac65e30
|
Updated component defaults files to match component schema and made schema validation strict.
|
2016-01-16 17:03:57 +01:00 |
|
|
verysecrethero
|
31c1c0ac8d
|
New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem
TODO: generalize the test
|
2016-01-11 15:49:33 +01:00 |
|
 stiffly
|
b698a0d36f
|
WIP
Adding models now crashes. Threading
Added a create player event that currently is not used.
|
2015-12-15 11:21:46 +01:00 |
|
|
stiffly
|
c2435fda2d
|
Added Component to Components.xsd and Entity.xsd
|
2015-12-11 14:27:54 +01:00 |
|
|
stiffly
|
80f028edf2
|
Added a very basic PlayerSystem, and a PlayerComponent.
|
2015-12-11 13:45:19 +01:00 |
|