 verysecrethero
|
ef87102d1f
|
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
|
2016-02-24 17:53:37 +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 |
|
|
verysecrethero
|
4103c878ec
|
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
|
2016-02-05 18:05:46 +01:00 |
|
|
verysecrethero
|
66f442f1af
|
Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity.
|
2016-02-05 16:13:59 +01:00 |
|
|
verysecrethero
|
fe6fd0bbe3
|
PickupSpawnSystem now spawns a new HealthPickup after the respawnTimer is up. Added HealthPickup.xml entity. Event PickupSpawned now gets published when a new HealthPickup spawns. Player now gains health as he picks up the HealthPickup.
|
2016-02-05 15:15:04 +01:00 |
|
|
verysecrethero
|
6a23a987b3
|
Started PickupSpawnSystem, added 2 events and a system
|
2016-02-04 17:43:45 +01:00 |
|