Dander7BD
|
779b2ee00c
|
More merge conflicts untanglement
|
2014-02-27 11:46:58 +01:00 |
|
Dander7BD
|
96cb865242
|
Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits
Conflicts:
Code/Game/GameClient/GameClientState/GameState.cpp
Code/Game/GameClient/GameClientState/GamingUI.cpp
Code/Game/GameLogic/GameAPI.h
Code/Game/GameLogic/Player.cpp
Code/Game/GameLogic/Player.h
Code/Game/GameServer/GameSession.h
Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp
Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp
Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h
|
2014-02-27 11:18:16 +01:00 |
Robin Engman
|
30c425f8fa
|
Fixed the damn path
|
2014-02-27 10:31:13 +01:00 |
|
Robin Engman
|
d81a1c204c
|
Added early triangle collisions
|
2014-02-27 10:31:12 +01:00 |
|
Robin Engman
|
800f514028
|
Fixed player going bonkers on lower hemisphere
|
2014-02-27 10:18:18 +01:00 |
dean11
|
504f11ef4c
|
Gameserver - Merged with gamelogic
|
2014-02-26 14:42:17 +01:00 |
|
Robin Engman
|
58df25c392
|
Fixed the damn path
|
2014-02-26 14:08:49 +01:00 |
|
Robin Engman
|
d5cda4deaa
|
Added early triangle collisions
|
2014-02-26 14:06:02 +01:00 |
Linda Andersson
|
a8055cfbf7
|
Merge with physics
|
2014-02-26 10:25:39 +01:00 |
|
Robin Engman
|
47e6d93957
|
Fixed player going bonkers on lower hemisphere
|
2014-02-25 18:25:51 +01:00 |
|
Robin Engman
|
954dc67f7a
|
Fixed multiple collisions
|
2014-02-21 14:09:38 +01:00 |
|
Robin Engman
|
d7e0b55a82
|
Experiment - Release from limbo
|
2014-02-21 12:21:10 +01:00 |
|
Robin Engman
|
628c81c33a
|
Fixed linear velocity
|
2014-02-21 11:33:57 +01:00 |
|
Robin Engman
|
e73c988b81
|
Added ability to get previous velocity for rigid bodies
|
2014-02-21 09:54:32 +01:00 |
|
Robin Engman
|
e3141cd1f9
|
Added move to limbo for custom bodies
NO idea if this works
|
2014-02-20 15:45:07 +01:00 |
|
Robin Engman
|
f8f656d7c9
|
Player now has better movement
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
|
2014-02-20 15:14:02 +01:00 |
|
Robin Engman
|
89c52d34f4
|
Changed order of move call
|
2014-02-20 11:15:13 +01:00 |
|
Robin Engman
|
a36a26721d
|
Added pre support for loading mesh shapes
Will be used for triangle collision
|
2014-02-18 10:12:21 +01:00 |
|
dean11
|
7395a0a495
|
Major cleanup
|
2014-02-17 10:38:11 +01:00 |