 verysecrethero
|
fc3a3a8f2e
|
Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed
|
2016-03-07 17:16:18 +01:00 |
|
 Jace
|
7624c6ee0a
|
Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.
|
2016-03-02 20:12:59 +01:00 |
|
|
Jace
|
26d6546d79
|
Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation
|
2016-03-02 18:53:40 +01:00 |
|
 Jocke
|
9161c11764
|
Changed m_ETriggerTouchVector for-loop so it wont break when an item triggers the condition. This is done to update all somePickup.DecreaseThisRespawnTimer's.
|
2016-03-02 15:31:42 +01:00 |
|
|
verysecrethero
|
4652cd7861
|
Added the already-at-maxammo/health-save-trigger for the PickupSystems
|
2016-03-02 11:53:04 +01:00 |
|
|
Jocke
|
aadfdfdd90
|
AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that
Client and it will update its ammo.
|
2016-03-01 17:55:00 +01:00 |
|
|
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
|
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
|
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 |
|