Dander7BD
|
d7102fe7e6
|
Merge remote-tracking branch 'origin/GamePhysics' into Camera-test-merge
|
2014-02-12 13:30:03 +01:00 |
Dander7BD
|
60d1fdba97
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge
Conflicts:
Code/Game/DanBiasGame/DanBiasGame.vcxproj
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/C_Object.h
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/GameState.h
Code/Game/DanBiasGame/GameClientState/LobbyState.h
Code/Game/DanBiasGame/GameClientState/LoginState.h
Code/Game/DanBiasGame/GameClientState/MainState.cpp
Code/Game/GameProtocols/ObjectProtocols.h
Code/Game/GameServer/Implementation/GameSession_General.cpp
|
2014-02-12 13:23:50 +01:00 |
Robin Engman
|
d4fa29e8a8
|
Fixed project files
|
2014-02-12 13:21:59 +01:00 |
Dander7BD
|
88341eaff7
|
Fixed incorrect settings for vld in some projects
Now links well with x64 as well
|
2014-02-12 13:14:28 +01:00 |
Robin Engman
|
15cc7cb85e
|
Fixed collision for object not in world
|
2014-02-12 12:38:52 +01:00 |
Dander7BD
|
295568d5e7
|
Fixed incorrect project settings
|
2014-02-12 11:54:47 +01:00 |
Robin Engman
|
5d29979875
|
Fixed which body to send
|
2014-02-12 10:58:05 +01:00 |
Robin Engman
|
2a214f5305
|
Added cone to apply effect
|
2014-02-12 10:31:50 +01:00 |
Robin Engman
|
f0178cf558
|
Added apply effect functionality
|
2014-02-12 10:23:17 +01:00 |
Robin Engman
|
7541994419
|
Added support for applying impulse
|
2014-02-12 08:50:10 +01:00 |
Robin Engman
|
1aa66dc79f
|
Quaternion to angular axis complete
|
2014-02-11 13:53:44 +01:00 |
Robin Engman
|
7075e6add6
|
Gravity well
|
2014-02-11 13:36:14 +01:00 |
Robin Engman
|
462413b527
|
Added support for gravity change
|
2014-02-11 13:09:46 +01:00 |
Robin Engman
|
b5631457d3
|
Fixed up functions again
|
2014-02-11 11:45:16 +01:00 |
Robin Engman
|
ee1dc530fa
|
Fixed up functions
|
2014-02-11 10:49:37 +01:00 |
Robin Engman
|
985dcf9691
|
Set up and stop angular movement support added
|
2014-02-11 09:15:21 +01:00 |
Robin Engman
|
26e151f9b4
|
Fixed state problem
|
2014-02-10 15:46:55 +01:00 |
Robin Engman
|
55a2c6593c
|
Added states
|
2014-02-10 14:50:40 +01:00 |
Robin Engman
|
bd8722f107
|
Options for rigid bodies are now set directly
|
2014-02-10 14:39:45 +01:00 |
Robin Engman
|
8547d17d0f
|
Friction and restitution is now set
|
2014-02-10 14:22:10 +01:00 |
Robin Engman
|
c18eb668aa
|
Added more data for bodies and added cylinder
|
2014-02-10 14:18:45 +01:00 |
Robin Engman
|
05aa3cc9e9
|
Added on move functionality
|
2014-02-10 13:55:01 +01:00 |
Robin Engman
|
ba0d6ca73a
|
Amazing merge with server
|
2014-02-10 12:42:31 +01:00 |
Robin Engman
|
8c31c16e4d
|
Commented away
|
2014-02-10 11:21:57 +01:00 |
Robin Engman
|
c16851f024
|
Using only lib and include
|
2014-02-10 11:14:45 +01:00 |
Robin Engman
|
427ec3b716
|
Major overhaul fix
|
2014-02-10 10:52:08 +01:00 |
Robin Engman
|
99146430a4
|
Major overhaul
|
2014-02-09 21:24:09 +01:00 |
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
Robin Engman
|
fb9e33fc9b
|
Fixed warnings
|
2014-02-08 14:26:18 +01:00 |
Robin Engman
|
92447a6352
|
Very cool stuff
|
2014-02-07 16:01:43 +01:00 |
Robin Engman
|
ab9f81ac60
|
Collisions work better
Still needs polishing
|
2014-02-07 15:38:53 +01:00 |
Robin Engman
|
1633129a2c
|
Commit to Dennis
|
2014-02-07 13:09:44 +01:00 |
Robin Engman
|
b225c53611
|
More cool stuff
|
2014-02-07 11:43:18 +01:00 |
Robin Engman
|
f372d3e05b
|
Some cool stuff
|
2014-02-06 21:15:28 +01:00 |
lindaandersson
|
70a2cf27e3
|
GL - almost ok, at least on the top of the world
|
2014-02-05 11:53:38 +01:00 |
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
Dander7BD
|
fb4025eb1a
|
bug fix
|
2014-02-04 16:56:31 +01:00 |
Dander7BD
|
c8e8d3510d
|
Added debug traps
|
2014-02-04 16:38:42 +01:00 |
Dander7BD
|
68dc5be9cb
|
added lost rebound deltatime compensation
|
2014-02-04 16:33:52 +01:00 |
Dander7BD
|
1952ff9aba
|
more fixes of potential bugs in Physics collision handling
|
2014-02-04 16:10:18 +01:00 |
Dander7BD
|
9622d37d3f
|
bug fixes in Physics collision handling
|
2014-02-04 15:43:17 +01:00 |
Dander7BD
|
e39eb5fb4b
|
RigidBody update adjusted
Spherical and Simple
|
2014-02-04 11:48:50 +01:00 |
Dander7BD
|
42cb1dab1d
|
API::SimpleBodyDescription API::SphericalBodyDescription fix
3 coeffs were not saved in factory constructor
|
2014-02-04 10:32:43 +01:00 |
Dander7BD
|
9817f844ef
|
Rebound adjustment trial
Rebound had a strong friction-like effect. Testing to see if it works
better if applied before the leapfrog update
|
2014-02-04 10:23:14 +01:00 |
Dander7BD
|
d4bd72bb4a
|
Friction fix
special case; no movement
special case; movement directly into surface
.. dealt with
|
2014-02-04 08:55:57 +01:00 |
Dander7BD
|
8b0e1b2426
|
Big patch! New feature :)
Objects will now rebound back when colliding.
|
2014-02-03 15:48:55 +01:00 |
Robin Engman
|
f527d329a2
|
Added limbo functionality
|
2014-02-03 15:15:47 +01:00 |
Robin Engman
|
50d895d37c
|
Applied friction
Needs to be tested.
|
2014-02-03 10:45:25 +01:00 |
Dander7BD
|
fabf471e76
|
Removed malign obsolete hack fix
|
2014-01-31 15:58:02 +01:00 |
Dander7BD
|
8f576c9a75
|
Removed malign obsolete hack fix
|
2014-01-31 15:30:23 +01:00 |