9da1419895
Merge remote-tracking branch 'origin/master' into Sound
2016-02-08 14:24:44 +01:00
8e86cc2123
Walking sound logic moved to PlayerMovementSystem and makes use of "wishDirection" to alleviate the problem where m_DistanceMoved were reset when it was not supposed to.
2016-02-08 14:23:53 +01:00
Jace
2b4e00e4b0
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
2016-02-08 13:33:55 +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
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
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
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
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +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
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
dba2fbdc0c
WIP
2016-02-02 14:52:31 +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
Jace
788407b709
Made CollisionSystem aware of entities
2016-01-27 15:42:50 +01:00
Jace
04f6233d99
Crude animations
2016-01-24 23:44:29 +01:00
Jace
373bb33cf0
Player jumping taking air acceleration into account
2016-01-24 15:20:34 +01:00
Jace
1ce9128da8
Source-like movement
2016-01-23 19:45:23 +01:00
Jace
666ef6589e
Crouching!
2016-01-23 15:06:47 +01:00
Jace
32f73201c5
Basic jumping!
2016-01-23 12:15:33 +01:00
Jace
55ee2bb3bf
Player input properly separated from editor input and server
2016-01-22 21:35:31 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
Jace
51979d7f0c
Changed System to take World through constructor and store it instead, cause it makes more sense.
2016-01-18 23:59:33 +01:00
b2358a1854
Added bool in Physics to toggle gravity for entities.
2016-01-18 18:16:24 +01:00
Jace
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
stiffly
Jace
verysecrethero
William Moberg
viktorljung