fad25c6e16
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
...
# Conflicts:
# include/Engine/Core/EPlayerHealthPickup.h
2016-02-08 10:21:30 +01:00
4bf91ba56a
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# resources/Schema/Components.xsd
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-08 10:12:13 +01:00
4103c878ec
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
2016-02-05 18:05:46 +01:00
09fb3a6571
Added some comments.
2016-02-05 18:04:36 +01:00
becb197feb
Player walk is now based on distance traveled, and it is also reset when key is released. However when dashing the player step sound is still played. The distance of a step is also hard coded in the header file. Will config it up some day.
2016-02-05 17:46:27 +01:00
454eef8225
WIP. Improving player walk logic.
2016-02-05 17:21:48 +01:00
fbdaf92953
Started refactoring. Put player walk logic in a designated sound system.
2016-02-05 16:39:23 +01:00
be628d9406
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-05 16:23:22 +01:00
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
2542397511
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
2016-02-05 15:35:51 +01:00
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
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
e90f802d48
Merge remote-tracking branch 'origin/master' into Sound
2016-02-05 13:59:21 +01:00
d61e605093
Can walk up "stair-steps". Cleanup WIP.
...
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
2016-02-05 10:56:34 +01:00
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
047e71a4e1
Added BoostAssault,BoostDefender components. Added their effects in HealthSystem,PlayerMovementSystem
2016-02-04 16:18:54 +01:00
035c79564b
Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.
2016-02-04 11:41:21 +01:00
0a8ee1623f
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# assets
2016-02-04 10:47:30 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
0bbaf1d576
Oops! Removed DebugCode...
2016-02-04 10:04:44 +01:00
7b5a2a5388
Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility".
2016-02-03 17:30:46 +01:00
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +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
455e59a04f
Made the TEMPORARY capture point boxes transparent.
2016-02-03 11:39:18 +01:00
39653a1e4c
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-03 10:38:21 +01:00
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +01:00
73ab9bb4c6
Merge remote-tracking branch 'origin/master' into AssaultDash
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-03 09:52:54 +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
7236da09b4
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-02 15:13:00 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
dba2fbdc0c
WIP
2016-02-02 14:52:31 +01:00
2085d9ec9e
Merge remote-tracking branch 'origin/master' into DoubleJump
2016-02-02 14:22:00 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
...
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
2016-02-02 13:26:15 +01:00
Jace
0e5f6da9a9
Merge pull request #73 from teamfisk/CapturePointFixBranch
...
Several changes/fixes based on the latest broken refactoring in master
2016-02-02 13:22:03 +01:00
42b52a6766
Several changes/fixes based on the latest broken refactoring.
...
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
2016-02-02 11:37:22 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
Jace
a22bc00d46
*cough*
2016-02-01 13:37:51 +01:00
7987d4b27c
Added AssaultDash and all its logic, including a doubletapkey. Doubletapkey could be made more generic.
2016-01-29 12:06:14 +01:00
0c97ce7a4a
You can now DoubleJump!
2016-01-29 10:12:49 +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
Jace
788407b709
Made CollisionSystem aware of entities
2016-01-27 15:42:50 +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
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
Jace
0334ec3fa7
Merge remote-tracking branch 'origin/Animations'
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-27 13:36:49 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
b6fd18baed
Hacked in serverside effects
2016-01-25 11:56:40 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
verysecrethero
stiffly
William Moberg
Tleety
Jace
viktorljung
Jocke