fe87aa8e90
Death effect re-added. Hands get weird when explosion is triggered.
2016-03-14 04:45:01 +01:00
Jace
f6113b9d9c
EEntityDeleted now provides an EntityWrapper instead of just an ID
2016-03-13 00:16:07 +01:00
534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
7bc3c9f7b1
Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.
2016-03-08 18:26:17 +01:00
1516ed8e2d
Removed debug logging. PlayerID in InputCommands from buttons is corrected.
2016-03-07 17:35:01 +01:00
962521fa59
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
2016-03-07 15:20:46 +01:00
282e0bf7c4
Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen.
2016-03-07 15:05:37 +01:00
0dfe00b406
Unlocks mouse when changing to SpectatorCamera and locking when respawning.
2016-03-04 09:49:27 +01:00
7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +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
629ebb871f
SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work.
2016-03-02 13:45:49 +01:00
3d4427dd20
Added entity SpectatorCamera that shows respawntime, will activate when explosion effect is deleted.
2016-03-01 17:32:14 +01:00
e2831c5593
CapturePointSystem fix, DamageIndicatorSystem fix
2016-02-23 17:29:33 +01:00
11af6a3078
Merge branch 'master' into Respawning
...
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/MovementTest.xml
# src/Game/Systems/SoundSystem.cpp
2016-02-12 00:29:51 +01:00
Jace
d1213f9f59
Working damage dealing, a super cool reload effect and hit markers!
2016-02-11 22:50:44 +01:00
97b915f130
Merge branch 'master' into Respawning
...
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
2016-02-11 16:15:47 +01:00
8eea0c8395
WIP respawning.
2016-02-11 16:08:19 +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
99cbdd3c1e
Player death effect fixes
2016-02-08 11:39:29 +01:00
0bbaf1d576
Oops! Removed DebugCode...
2016-02-04 10:04:44 +01:00
2961f198b3
PlayerDeathSystem is now working well. Changed so the model is oriented correctly. Changed so camera is behind the player. Copied the current animation and froze it.
2016-02-03 11:48:22 +01:00
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
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
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
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
Jocke
Jace
William Moberg
viktorljung
verysecrethero