 William Moberg
|
5987751add
|
Merge pull request #81 from teamfisk/HealthPickup
Health pickup
|
2016-02-08 11:50:47 +01:00 |
|
 verysecrethero
|
ce22854168
|
HealthPickups are now based on a percentage of player maxhealth. You can no longer pickup healthpacks if you are at max health. You can no longer gain more than maxHealth.
|
2016-02-08 11:22:28 +01:00 |
|
|
verysecrethero
|
2542397511
|
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
|
2016-02-05 15:35:51 +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
|
7497ff39d2
|
Simon added Copy method to ComponentWrapper. Its being used in PlayerDeathSystem to copy model,animation,transform. TODO: 3rd person camera, cleanup, tests
|
2016-01-27 18:00:31 +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 |
|
 Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +01:00 |
|
|
Jace
|
b4081b3e45
|
Merge remote-tracking branch 'origin/Networking'
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
|
2016-01-24 18:36:37 +01:00 |
|
|
Jace
|
235b26ad61
|
WIP shoot
|
2016-01-24 17:16:18 +01:00 |
|
 Jocke
|
97d70f8e32
|
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
|
2016-01-24 11:36:01 +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 |
|
|
verysecrethero
|
2381f01d12
|
HealthSystem now deletes the entity after publishing the PlayerDeath event
|
2016-01-21 14:25:01 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
|
verysecrethero
|
f197993beb
|
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
|
2016-01-19 15:31:15 +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 |
|
|
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
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|