 viktorljung
|
d587c9a692
|
Fixed first person strafe animation
|
2016-03-13 22:17:55 +01:00 |
|
|
viktorljung
|
44f46cda8d
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CP_Rocky2.xml
# resources/Schema/Entities/MuzzleFlashBlue.xml
# resources/Schema/Entities/MuzzleFlashFire.xml
# resources/Schema/Entities/MuzzleFlashRed.xml
# resources/Schema/Types/Entity.xsd
# resources/Shaders/Sprite.frag.glsl
# src/Game/Systems/AbilityCooldownHUDSystem.cpp
# src/Game/Systems/BoostIconsHUDSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
# src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
# src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
|
2016-03-13 15:17:15 +01:00 |
|
|
viktorljung
|
0b26f23188
|
3rd person animations idle bug fixed
|
2016-03-12 15:47:19 +01:00 |
|
 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 |
|
|
Jace
|
80649ce51d
|
Updated the ENTIRE CODEBASE TO MATCH
|
2016-03-12 00:38:33 +01:00 |
|
 William Moberg
|
8a8c375d3a
|
Merge remote-tracking branch 'origin/master' into BoxModelCollision
|
2016-03-10 09:57:33 +01:00 |
|
|
viktorljung
|
d42d886dcc
|
3rd person animations synced with 1st person animations
|
2016-03-09 18:27:09 +01:00 |
|
|
William Moberg
|
8a3564ad49
|
Merge remote-tracking branch 'origin/master' into BoxModelCollision
|
2016-03-09 18:03:39 +01:00 |
|
|
William Moberg
|
9581e9ac84
|
Don't set the player to previous position when uncrouching.
|
2016-03-09 17:51:26 +01:00 |
|
|
viktorljung
|
f934f972e8
|
Merge remote-tracking branch 'origin/Weapons' into Movement
# Conflicts:
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-08 14:34:21 +01:00 |
|
|
viktorljung
|
f77a610519
|
Dash now looking good
|
2016-03-08 13:26:01 +01:00 |
|
|
viktorljung
|
2ba245368b
|
Improved movement animaitons
Added a SetBlendWeight event that sets the weight for all nodes with a name.
|
2016-03-08 11:21:40 +01:00 |
|
|
Jace
|
f923872e51
|
fixup! Disabled InputCommand processing while you fiddle with editor UI elements
|
2016-03-07 17:54:01 +01:00 |
|
|
viktorljung
|
c1f5cf65a7
|
Movement animations
|
2016-03-04 09:39:16 +01:00 |
|
|
viktorljung
|
7ba0e4ea9d
|
Run, Strafe and jump animations now playing
|
2016-03-04 08:35:02 +01:00 |
|
 verysecrethero
|
be331cb778
|
fixed
|
2016-03-03 18:05:10 +01:00 |
|
|
verysecrethero
|
a72dc94d5d
|
Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
|
2016-03-03 17:35:17 +01:00 |
|
|
verysecrethero
|
c5f3bfc0cd
|
Fixed the stuff in comments
|
2016-03-03 17:33:41 +01:00 |
|
 Jocke
|
da81f21799
|
Merge remote-tracking branch 'origin/master' into SniperSprintBranch
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
|
2016-03-03 12:16:09 +01:00 |
|
 stiffly
|
267c007291
|
Removed unnecessary comments, variables and functions.
|
2016-03-02 17:39:27 +01:00 |
|
|
verysecrethero
|
f84d1ac4a1
|
Merge remote-tracking branch 'origin/master' into SniperSprintBranch
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
|
2016-03-02 17:11:36 +01:00 |
|
|
stiffly
|
a5c086e389
|
Dash effect now working over network, by sending events. Similar to jump effect.
|
2016-03-02 16:48:38 +01:00 |
|
|
stiffly
|
1217b25d02
|
DashEffect will now spawn a player model behind the player that will fade out .
|
2016-03-02 14:15:20 +01:00 |
|
|
verysecrethero
|
f147929aa9
|
Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings
|
2016-03-01 17:57:18 +01:00 |
|
|
verysecrethero
|
b81bb9eeea
|
Changed SprintAbility to take StrengthOfEffect. PlayerMovementSystem: if Sniper is sprinting he will now move faster.
|
2016-02-18 15:17:19 +01:00 |
|
|
verysecrethero
|
8f28c760dd
|
You can now AssaultDash in the air
|
2016-02-17 11:47:10 +01:00 |
|
|
verysecrethero
|
a8ab49f202
|
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
# Conflicts:
# include/Game/Systems/PlayerMovementSystem.h
|
2016-02-11 15:19:01 +01:00 |
|
|
verysecrethero
|
a53ab7f745
|
A few fixes for DashAbility. Default DoubleTapToDash is now set to false.
|
2016-02-10 20:46:16 +01:00 |
|
|
stiffly
|
fbdaf92953
|
Started refactoring. Put player walk logic in a designated sound system.
|
2016-02-05 16:39:23 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
03a16b46b5
|
Dash component now has the dash-maxCoolDownVariable in it.
|
2016-02-04 10:28:28 +01:00 |
|
|
verysecrethero
|
1bd4aa91ff
|
Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.
|
2016-02-03 17:45:37 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
9d3171540d
|
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
|
2016-02-03 11:54:14 +01:00 |
|
|
verysecrethero
|
45a92b362f
|
DoubleJumping now in InputController instead.
|
2016-02-02 15:10:11 +01:00 |
|
|
Jace
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
32f73201c5
|
Basic jumping!
|
2016-01-23 12:15:33 +01:00 |
|
|
Jace
|
3aeeb3cad5
|
Moved FirstPersonInputController implementation out of header
|
2016-01-23 12:15:32 +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
|
0469460029
|
Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!
|
2016-01-15 16:32:04 +01:00 |
|
|
Jace
|
30474b70df
|
MouseInputHandler
|
2015-12-12 13:42:46 +01:00 |
|
|
Jace
|
03e226ffea
|
Refactored InputProxy to gracefully handle cases where multiple origins send the same command
|
2015-12-12 13:42:35 +01:00 |
|
|
Jace
|
013f911ae2
|
Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement.
|
2015-12-12 13:42:34 +01:00 |
|
|
Jace
|
35624008e7
|
InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file.
|
2015-12-12 13:42:34 +01:00 |
|
|
Jace
|
bffc97f310
|
Groundwork for input command proxy
|
2015-12-12 13:42:33 +01:00 |
|
 sippeangelo
|
5f9dce4303
|
Added Input
|
2015-11-24 10:37:50 +01:00 |
|
|
sippeangelo
|
63674946ca
|
Initial directory structure
|
2015-11-20 15:01:37 +01:00 |
|