 Jace
|
b48d491ad7
|
Complete blue and red player entities
|
2016-02-12 07:45:51 +01:00 |
|
 William Moberg
|
40ae2b8cbb
|
DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem.
|
2016-02-12 00:52:58 +01:00 |
|
|
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
|
2b4e00e4b0
|
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
|
2016-02-08 13:33:55 +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 |
|
|
Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +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 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|