 viktorljung
|
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 |
|
 William Moberg
|
629ebb871f
|
SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work.
|
2016-03-02 13:45:49 +01:00 |
|
|
William Moberg
|
3d4427dd20
|
Added entity SpectatorCamera that shows respawntime, will activate when explosion effect is deleted.
|
2016-03-01 17:32:14 +01:00 |
|
 verysecrethero
|
e2831c5593
|
CapturePointSystem fix, DamageIndicatorSystem fix
|
2016-02-23 17:29:33 +01:00 |
|
|
William Moberg
|
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 |
|
|
William Moberg
|
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 |
|
|
William Moberg
|
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 |
|
|
verysecrethero
|
0bbaf1d576
|
Oops! Removed DebugCode...
|
2016-02-04 10:04:44 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
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 |
|