BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,964 Commits 116 Branches 0 Tags
e45d0e8232f5674e57e59634c63863ab192002f1
Commit Graph

97 Commits

Author SHA1 Message Date
William Moberg 8a8c375d3a Merge remote-tracking branch 'origin/master' into BoxModelCollision 2016-03-10 09:57:33 +01:00
William Moberg 8936b3d6c3 Probably fixed all the jittering, won't need the jitter guard anymore. 2016-03-09 19:45:26 +01:00
viktorljung d42d886dcc 3rd person animations synced with 1st person animations 2016-03-09 18:27:09 +01:00
William Moberg 9581e9ac84 Don't set the player to previous position when uncrouching. 2016-03-09 17:51:26 +01:00
viktorljung 70ec075887 3rd person aim improvements 2016-03-09 13:19:56 +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 8d1877321a Fixed BoneAttachment offset rotation 2016-03-08 14:32:50 +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 e58b5ffd6f Merge remote-tracking branch 'origin/Movement' into Weapons 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 09:43:34 +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
Jocke d78a7e20e2 Merge branch 'master' into Weapons 2016-03-04 08:29:33 +01:00
Jocke 0398006fdc added safety ifs and renamed dasheffect to sprinteffect 2016-03-04 03:19:41 +01:00
Jace 3a8f7c5d03 First attempt at AssaultWeapon animations! 2016-03-04 02:48:03 +01:00
Jocke ae13a2db6b Player cannot see their own sprint effect. 2016-03-03 22:09:51 +01:00
Jocke b1148c0c6c Added a afterimage SprintEffect for the Sniper. 2016-03-03 21:24:31 +01:00
Joachim Pettersson 2dfcd3ad95 Merge pull request #158 from teamfisk/SniperSprintBranch 
Looks good// William
 2016-03-03 18:25:38 +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 ae3cab6cd1 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 2016-03-03 13:31:43 +01:00
Jocke a9b19d9af1 Packet write now only warns when a a packet is huge 2016-03-03 13:29:45 +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
Jocke cb7beae28c Only do physics and collision calculations on the clients side, and only for their own entity. 2016-03-03 11:39:00 +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
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 92d5ec70ba Merge remote-tracking branch 'origin/master' into DashAbiltyEffect 2016-03-02 16:57:07 +01:00
stiffly 233a1d0990 The dash effect is now ignored on the local player, because it was annoying. Copies of yourself could be in your way. 2016-03-02 16:56:43 +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
verysecrethero 3c8df35be9 Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-02 15:59:16 +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
William Moberg c7dad79e72 Merge branch 'master' into JumpHeightAdjustment 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-29 17:28:40 +01:00
Jocke 059fe5c6c0 Fixed typo m_EPDoubleJump to m_EDoubleJump. 2016-02-25 16:04:27 +01:00
Jocke f66fa7a183 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 
# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/MessageType.h
#	include/Engine/Network/Server.h
#	include/Engine/Network/TCPServer.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/TCPServer.cpp
 2016-02-25 15:13:11 +01:00
William Moberg cd315bbaa0 Added DoubleJump component and JumpSpeed in Player component so jumpheight can be adjusted for regular jump and double jump. 2016-02-25 12:12:44 +01:00
Jocke fa13c1d065 Double jump is now working. 2016-02-23 18:24:46 +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 7f489b3569 Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage. 2016-02-18 10:40:09 +01:00
verysecrethero 56bc1fee3d Added LifeTimeOfEffect in BoostAssault,BoostDefender components. 2016-02-17 16:43:38 +01:00
verysecrethero 1c9a1a9904 playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted. 2016-02-17 16:04:44 +01:00
verysecrethero 456cd35a12 Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-02-17 11:52:06 +01:00
Jocke a006db9e63 WIP Fix dsync 2016-02-16 16:06:17 +01:00
Jace ca457d9c00 Player names 2016-02-12 09:07:59 +01:00
Tleety a8a3366e8a Hopeless attempts to fix network bugs 2016-02-12 05:17:09 +01:00
Jace 5295133311 Hack to sync ammo over network until we have input replaying + Reload effect from all views 2016-02-12 01:45:54 +01:00
Jace 7cae84d4ee Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Core/EPlayerDamage.h
#	src/Game/Game.cpp
#	src/Game/Systems/Weapon/WeaponSystem.cpp
 2016-02-11 22:52:51 +01:00
verysecrethero 4a17e3c8f3 airFriction changed to 2.0 to fix the dash ability in the air 2016-02-11 21:42:29 +01:00