232bf66a09
Jump height is constant for the double jump.
2016-02-09 16:09:08 +01:00
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +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
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
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
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +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
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +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
2085d9ec9e
Merge remote-tracking branch 'origin/master' into DoubleJump
2016-02-02 14:22:00 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
...
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
2016-02-02 13:26:15 +01:00
Jace
0e5f6da9a9
Merge pull request #73 from teamfisk/CapturePointFixBranch
...
Several changes/fixes based on the latest broken refactoring in master
2016-02-02 13:22:03 +01:00
42b52a6766
Several changes/fixes based on the latest broken refactoring.
...
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
2016-02-02 11:37:22 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
Jace
a22bc00d46
*cough*
2016-02-01 13:37:51 +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
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
Jace
0334ec3fa7
Merge remote-tracking branch 'origin/Animations'
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-27 13:36:49 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
b6fd18baed
Hacked in serverside effects
2016-01-25 11:56:40 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
d12246833e
Some further small fizes to resolution //Tobias
2016-01-25 01:26:41 +01:00
Jace
b95c1fdfa4
Merge remote-tracking branch 'origin/Menu'
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
2016-01-25 00:25:03 +01:00
Jace
7b348379ac
Quaternions are never the solution.
2016-01-25 00:22:55 +01:00
Jace
04f6233d99
Crude animations
2016-01-24 23:44:29 +01:00
Jace
d0de169613
Instagib!
2016-01-24 23:05:52 +01:00
d03b3fb071
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-01-24 22:23:53 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
Jace
9f3d887ac4
Networking bugfixes
2016-01-24 18:37:36 +01:00
Jace
b4081b3e45
Merge remote-tracking branch 'origin/Networking'
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-24 18:36:37 +01:00
Jace
235b26ad61
WIP shoot
2016-01-24 17:16:18 +01:00
Jace
3261e21d96
Coloring players depending on team and created a blue spawn in MovementTest
2016-01-24 15:46:01 +01:00
Jace
373bb33cf0
Player jumping taking air acceleration into account
2016-01-24 15:20:34 +01:00
Jace
aaa11d2109
Merge remote-tracking branch 'origin/master' into PlayerMovement
2016-01-24 14:18:23 +01:00
aa3b8cd652
Fixed text color and removed debugging code
2016-01-24 13:37:07 +01:00
7567f47a68
Weapon system now searches parents for health component (stops at first health component).
2016-01-24 11:56:46 +01:00
97d70f8e32
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
2016-01-24 11:36:01 +01:00
Jace
1ce9128da8
Source-like movement
2016-01-23 19:45:23 +01:00
ecdb5ed07d
Merge remote-tracking branch 'origin/master' into Networking
2016-01-23 17:51:06 +01:00
aacfc47fb5
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
2016-01-23 15:12:19 +01:00
Jace
666ef6589e
Crouching!
2016-01-23 15:06:47 +01:00
Jace
b83d773627
Infinite respawning for now
2016-01-23 15:06:41 +01:00
680a12d88f
HealthMeter
2016-01-23 14:53:17 +01:00
Jace
32f73201c5
Basic jumping!
2016-01-23 12:15:33 +01:00
Jace
db0e67b9bd
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 11:44:16 +01:00
William Moberg
verysecrethero
Jace
Jocke
viktorljung
stiffly