 Jace
|
01db8e0615
|
Merge remote-tracking branch 'origin/master' into Dirtybit
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-03-12 04:09:53 +01:00 |
|
 verysecrethero
|
52d3cb3ebf
|
GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all
|
2016-03-08 16:33:08 +01:00 |
|
|
verysecrethero
|
0e0a486c01
|
AmmoPickupSystem should now be able to give ammo to all classtypes
|
2016-03-08 11:48:54 +01:00 |
|
|
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 |
|
|
verysecrethero
|
af30e51564
|
Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.
|
2016-02-11 23:56:40 +01:00 |
|