Erik Persson
|
e11dc6551c
|
GL - ?
|
2014-01-27 14:45:19 +01:00 |
lindaandersson
|
a8dbf2a4c9
|
GL - added test box to level
|
2014-01-27 14:43:39 +01:00 |
|
lindaandersson
|
3896514bae
|
GL - mergecommit
|
2014-01-27 14:02:37 +01:00 |
|
lindaandersson
|
4085a5f5e2
|
GL - added shot protocol
|
2014-01-27 13:56:31 +01:00 |
|
Erik Persson
|
1ed1bab751
|
Created test box that should now be shot at by the player
|
2014-01-27 13:55:09 +01:00 |
|
lindaandersson
|
5b984db9ba
|
GL - gameState merge
|
2014-01-27 13:25:09 +01:00 |
|
Erik Persson
|
74ac5e2d31
|
Updated creation of objects
|
2014-01-27 08:54:25 +01:00 |
|
lindaandersson
|
fb2cf714c6
|
GL - sending dir to server, forward and backward walking works
|
2014-01-23 14:28:53 +01:00 |
|
lindaandersson
|
07e5519850
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 09:25:02 +01:00 |
|
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
|
Erik Persson
|
bd739f8acb
|
GL - Creation of objects kinda sorted
|
2014-01-23 09:14:04 +01:00 |
|
Erik Persson
|
121fd51c45
|
GL collision with level should worm
|
2014-01-23 08:57:46 +01:00 |
|
lindaandersson
|
3f144289ec
|
GL - merge with gameserver, crash on collision in gameLogic
|
2014-01-23 08:30:26 +01:00 |
|
lindaandersson
|
a591903d8f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 08:25:10 +01:00 |
|
lindaandersson
|
f657a58a4f
|
GL - adding a camera on the client
|
2014-01-23 08:24:35 +01:00 |
|
Erik Persson
|
6a888cb154
|
GL - adjusting collisionManager
|
2014-01-22 15:47:44 +01:00 |
Dennis Andersen
|
22a5db97f8
|
Added final protocols, and a bit of support for them on server side
|
2014-01-22 15:22:52 +01:00 |
|
Erik Persson
|
467cf1eb68
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-01-22 14:41:53 +01:00 |
|
Erik Persson
|
ce80e8155c
|
GL - formatting mistake
|
2014-01-22 14:39:10 +01:00 |
|
Erik Persson
|
43eac4cbe3
|
moved ForcePushAction for massdriver to collisionManager
|
2014-01-22 14:26:45 +01:00 |
Robin Engman
|
bcbe67b620
|
Made default value of onCollisionResponse null
|
2014-01-22 14:09:53 +01:00 |
|
Robin Engman
|
53961f0e88
|
Added new onCollisionResponse handle
|
2014-01-22 13:50:54 +01:00 |
|
Erik Persson
|
80204ecbe3
|
GL - Massdriver usage of applyeffect
|
2014-01-22 13:02:13 +01:00 |
|
Robin Engman
|
0cae6261e9
|
ApplyEffect is now easier to handle for the user
Only needs a function with a pointer to an ICustomBody now.
|
2014-01-22 12:36:12 +01:00 |
Sam Mario Svensson
|
0443e753e8
|
GameLogic, Uml for levelLoader updated
|
2014-01-22 11:32:11 +01:00 |
|
Erik Persson
|
c178ec34fd
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-22 10:51:24 +01:00 |
|
Erik Persson
|
db593f65a2
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-01-22 10:51:13 +01:00 |
|
Sam Mario Svensson
|
1b86500ab0
|
GameLogic - Uml for LevelLoader
|
2014-01-22 10:39:16 +01:00 |
|
Erik Persson
|
954de26b43
|
GL - mergeproblems
|
2014-01-21 16:11:02 +01:00 |
|
Erik Persson
|
0aae9de92b
|
blah
|
2014-01-21 16:10:07 +01:00 |
|
Erik Persson
|
ebaa668382
|
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
|
2014-01-21 16:09:39 +01:00 |
|
lindaandersson
|
6cf5ed3a22
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-21 14:58:08 +01:00 |
|
Robin Engman
|
5c85580ffd
|
Added gravity normal to state struct
|
2014-01-21 14:56:34 +01:00 |
|
lindaandersson
|
8792aab992
|
GL - merge with gameServer
|
2014-01-21 14:36:46 +01:00 |
|
Dennis Andersen
|
50c09547f3
|
GameServer - Added protocols and stuff
|
2014-01-21 14:32:42 +01:00 |
|
lindaandersson
|
561418c427
|
GL - gravity working
|
2014-01-21 14:28:27 +01:00 |
|
Robin Engman
|
39e4f7881b
|
Added typedef for collision response
|
2014-01-21 14:24:45 +01:00 |
|
Robin Engman
|
b0227ab513
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
|
2014-01-21 14:11:17 +01:00 |
|
Robin Engman
|
090d44b518
|
Added visit function to API
Called with collideable and hit action
|
2014-01-21 14:10:31 +01:00 |
Dander7BD
|
65db1bf90d
|
lerp fix 3
|
2014-01-21 12:11:30 +01:00 |
|
Dander7BD
|
0d39240fc2
|
lerp fix 2
|
2014-01-21 12:08:31 +01:00 |
|
Dander7BD
|
b422d2d509
|
lerp fix
|
2014-01-21 12:01:12 +01:00 |
|
Robin Engman
|
94f1c20817
|
Added more data to rigid body description.
Friction and restitution coeffs
|
2014-01-21 11:48:04 +01:00 |
|
Dander7BD
|
ea647c185c
|
Merge branch 'LERP' into Physics
|
2014-01-21 11:23:32 +01:00 |
|
Dander7BD
|
9a2d2b9490
|
Interpolation methods referred in ::Oyster::Math & Math3D
|
2014-01-21 11:23:03 +01:00 |
|
Dander7BD
|
408d51e46b
|
SnapAxisYToNormal_UsingNlerp implemented
|
2014-01-21 11:15:33 +01:00 |
|
lindaandersson
|
c7b3c1ec30
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-21 10:38:03 +01:00 |
|
lindaandersson
|
06d468299a
|
GL - linking problem fix
|
2014-01-21 10:37:45 +01:00 |
|
Dander7BD
|
43e5561995
|
Gravity fix 3
|
2014-01-21 10:34:22 +01:00 |
|
Dander7BD
|
7087421bb9
|
InterpolateAxisYToAxis_Nlerp implemented
|
2014-01-21 10:32:44 +01:00 |