267c007291
Removed unnecessary comments, variables and functions.
2016-03-02 17:39:27 +01:00
92d5ec70ba
Merge remote-tracking branch 'origin/master' into DashAbiltyEffect
2016-03-02 16:57:07 +01:00
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
a5c086e389
Dash effect now working over network, by sending events. Similar to jump effect.
2016-03-02 16:48:38 +01:00
3c8df35be9
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# src/Game/Game.cpp
2016-03-02 15:59:16 +01:00
1217b25d02
DashEffect will now spawn a player model behind the player that will fade out .
2016-03-02 14:15:20 +01:00
f147929aa9
Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings
2016-03-01 17:57:18 +01:00
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
059fe5c6c0
Fixed typo m_EPDoubleJump to m_EDoubleJump.
2016-02-25 16:04:27 +01:00
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
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
fa13c1d065
Double jump is now working.
2016-02-23 18:24:46 +01:00
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
56bc1fee3d
Added LifeTimeOfEffect in BoostAssault,BoostDefender components.
2016-02-17 16:43:38 +01:00
1c9a1a9904
playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.
2016-02-17 16:04:44 +01:00
456cd35a12
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-17 11:52:06 +01:00
a006db9e63
WIP Fix dsync
2016-02-16 16:06:17 +01:00
Jace
ca457d9c00
Player names
2016-02-12 09:07:59 +01:00
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
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
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
2f53ed140f
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-10 14:16:55 +01:00
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
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
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
f6a7b8ea0c
Merge remote-tracking branch 'origin/master' into Sound
2016-02-10 11:37:17 +01:00
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
94ff12cf66
When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter.
2016-02-10 11:15:49 +01:00
c09c2f4783
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-09 22:50:19 +01:00
7212217460
Added animation blending and offset animation component
2016-02-09 22:15:43 +01:00
232bf66a09
Jump height is constant for the double jump.
2016-02-09 16:09:08 +01:00
Jace
e69864680d
PlayerMovementSystem now only updates the velocity of the local player, as it should
2016-02-09 16:08:06 +01:00
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
stiffly
verysecrethero
William Moberg
Jocke
Jace
Tleety
viktorljung