 Jace
|
2c0f66d9c7
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-10 17:02:00 +01:00 |
|
|
Jace
|
99cbdd3c1e
|
Player death effect fixes
|
2016-02-08 11:39:29 +01:00 |
|
 verysecrethero
|
0bbaf1d576
|
Oops! Removed DebugCode...
|
2016-02-04 10:04:44 +01:00 |
|
|
verysecrethero
|
5e472cd69c
|
DeathExplosion is now an XML file, changed PlayerDeathSystem accordingly. The effect should show as soon as the explosioneffect-fix is merged into master. TODO: remove the test
|
2016-02-02 17:18:12 +01:00 |
|
|
verysecrethero
|
df05f1909b
|
Completed the code to trigger the 3rd person camera on death. Cleaned up PlayerDeathSystem. Fixed HealthSystemTest. Removed the test for PlayerDeathSystem
|
2016-01-28 11:43:38 +01:00 |
|
|
verysecrethero
|
5cdf6db340
|
Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem
|
2016-01-27 14:46:45 +01:00 |
|