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

85 Commits

Author SHA1 Message Date
Jocke 2187df080a Merge branch 'master' into IconsForPlaytest 2016-03-04 05:17:54 +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
Jace e2a8605101 Merge remote-tracking branch 'origin/master' into WeaponSystem 2016-02-11 17:25:37 +01:00
Jace e47201ff61 First person shoot animations 2016-02-11 17:06:34 +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
Jace 9d9c6bdf1e Third person animations and shoot effects base work 2016-02-11 00:08:50 +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 019e85a425 Merge pull request #89 from teamfisk/Animations 
Animations
 2016-02-10 14:40:23 +01:00
verysecrethero 2f53ed140f Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-02-10 14:16:55 +01:00
viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp
 2016-02-10 14:13:08 +01:00
stiffly c2128790af Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle. 2016-02-10 14:07:11 +01:00
verysecrethero b6b96c5f11 Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0) 2016-02-10 11:51:58 +01:00
stiffly f6a7b8ea0c Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 11:37:17 +01:00
viktorljung 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-02-10 11:33:45 +01:00