6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
b85439bd5e
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-18 18:01:23 +01:00
f660a5c64e
Added ICustombody event subscription
...
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.
External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-17 16:07:25 +01:00
7c448792dd
Gravity normal fix
...
Forgot to update that value. Done
2014-01-17 13:30:07 +01:00
eaf0ae1479
GL - can now compile
2014-01-17 08:52:34 +01:00
7b2be02113
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-16 12:26:33 +01:00
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +01:00
d08e999f07
Create level and initiate it with a rigidbody etc
2014-01-16 12:08:24 +01:00
df7801336a
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:40:58 +01:00
225d8912da
GL - make rigidbody level
2014-01-16 11:40:29 +01:00
36a8372072
Merge branch 'Gravity' into Physics
2014-01-16 11:36:31 +01:00
2e32ac02fa
Merge remote-tracking branch 'origin/CollisionResponse' into Physics
2014-01-16 11:36:18 +01:00
27b6affd6a
BoxVsBox pointOfContact fix
...
it was not translated
2014-01-16 11:28:07 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
8f3befecf4
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:16:26 +01:00
a070e4d459
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 09:30:30 +01:00
aac92bc20e
GL- send new player pos to client
2014-01-16 09:30:16 +01:00
0c8783ba84
GL - merge done
2014-01-15 12:02:52 +01:00
8557559b9b
GL - going to merge
2014-01-15 11:57:36 +01:00
5f00aa7af7
GL - Merge with origin/Gamelogic
2014-01-15 11:45:34 +01:00
208482b0ce
GL merge error
2014-01-15 11:25:59 +01:00
ceac5ce31d
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
2014-01-15 11:03:25 +01:00
44e071fba9
Gravity implemented
2014-01-15 10:44:31 +01:00
7a48e058da
Added Equal operators to Gravity struct
...
== & !=
2014-01-15 10:44:20 +01:00
e9ad87507f
Obsolete code removed
...
More commentated out than deleted actually
2014-01-15 09:06:57 +01:00
9a32c44e49
GL - Merge branch 'GameLogic'
2014-01-15 08:19:35 +01:00
0ffe26c134
GL - Merge client with gameserver
2014-01-15 08:18:06 +01:00
8c7a17ff8f
Added missing mass and inertia
2014-01-14 11:58:53 +01:00
8f630125b4
AngularVelocity fix
2014-01-14 11:42:54 +01:00
89ef3b830a
Revert "Inertia tensor fix"
...
This reverts commit 23dab9dea6
2014-01-14 11:40:47 +01:00
23dab9dea6
Inertia tensor fix
...
should produce radian anglevelocities
2014-01-14 11:32:02 +01:00
54babfc7c7
Gameserver - Merged with Gamelogic
2014-01-14 10:38:35 +01:00
01e7614a5c
Tangiential formula fixes
2014-01-14 10:34:22 +01:00
4c1be4d807
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/Game.cpp
2014-01-14 10:33:08 +01:00
87b8c0c7bb
Gameserver - Merged with Gamelogic
2014-01-14 10:29:39 +01:00
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
32e64c0dbb
GL - moved reciever struct to a separate file
2014-01-14 10:25:49 +01:00
82de85d1ac
Fixed minor server network bug, modified shader to get visual
2014-01-14 10:15:50 +01:00
844aa37906
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer
2014-01-14 09:25:39 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
eb6ed13cce
Merge remote-tracking branch 'origin/Graphics' into GameLogic
2014-01-14 09:25:16 +01:00
04c5898f4e
GL - sending string and createOBJ working
2014-01-14 09:24:55 +01:00
8aa5ad7723
Revert "Work asssignment split line"
...
This reverts commit 8ecd263318
2014-01-14 09:16:54 +01:00
cc68088298
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-14 09:14:17 +01:00
50b5b2dbf9
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-14 09:12:37 +01:00
c1c3b5e6af
angular collision response fix
...
Incorrect formula found and corrected
2014-01-14 09:02:46 +01:00
eb9360377d
GameServer - Merged with other half of GameLogic
2014-01-13 12:50:27 +01:00
ce89e6bc98
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
2014-01-13 12:44:33 +01:00
792f78c34a
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
2014-01-13 12:11:45 +01:00
8ecd263318
Work asssignment split line
2014-01-13 10:25:20 +01:00
Dennis Andersen
Dander7BD
Erik Persson
lindaandersson
Robin Engman