dean11
0e23bcfc82
GameLogic - Modified some names and cleand up some junk
2014-02-19 10:36:45 +01:00
Erik Persson
f14a83aef2
GL - Explosivebox now takes a float forceMagnitude instead of a vector
2014-02-14 10:57:24 +01:00
Erik Persson
59697bfcea
GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction
2014-02-14 09:59:26 +01:00
Sam Mario Svensson
64b2d688bd
Försök till merge men det är cp
2014-02-12 14:48:58 +01:00
lindaandersson
e8536cc5d4
GL - removed before collision event, sending look and right dir to server
2014-02-12 13:11:35 +01:00
dean11
de4ea0a830
GameServer - Merged with GameLogic, some stuff is broken
2014-02-11 13:03:37 +01:00
lindaandersson
d16d223c2b
GL - player moving
2014-02-11 10:11:38 +01:00
lindaandersson
49d29d87a5
GL - merge with bullet physics and updated server
2014-02-10 14:41:43 +01:00
lindaandersson
c87bab8808
GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)
2014-02-10 14:00:14 +01:00
Dennis Andersen
310ed3dfc5
GameServer - Multiplayer now working properly
2014-02-09 16:42:26 +01:00
lindaandersson
e21cfe4cd4
GL - merge with Erik
2014-02-03 16:21:48 +01:00
lindaandersson
a3886c4f1f
GL - added models and started to fix camera movement
2014-02-03 15:52:00 +01:00
Erik Persson
99b041f165
GL - first implementation of weapons forcepull with pickup functionallity
2014-02-03 15:32:58 +01:00
lindaandersson
fa7f400c71
GL - test this robin
2014-01-31 10:58:03 +01:00
lindaandersson
09693c7f35
GL - merge
2014-01-30 09:40:58 +01:00
lindaandersson
44ba45bcc2
GL - added setCollisionfunc to object
2014-01-29 16:01:56 +01:00
lindaandersson
446bdd412b
GL - updated constructors to set before and after collision response functions
2014-01-29 14:33:21 +01:00
lindaandersson
3b552d5361
GL - change gamelogic to use the new physics
2014-01-28 15:44:32 +01:00
lindaandersson
a56fcbcb9b
GL - can send object position from level objects, gravity and frustrum problems.
2014-01-28 15:04:25 +01:00
Erik Persson
74ac5e2d31
Updated creation of objects
2014-01-27 08:54:25 +01:00
Erik Persson
bd739f8acb
GL - Creation of objects kinda sorted
2014-01-23 09:14:04 +01:00
Erik Persson
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
Dennis Andersen
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
Dennis Andersen
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
Dennis Andersen
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
Erik Persson
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +01:00
Erik Persson
52ba5602d5
GameLogic - player now using some of the new phys api
2014-01-09 13:06:18 +01:00
Erik Persson
48b9189a03
Revert "state"
...
This reverts commit 4a07586076
.
2014-01-09 12:51:17 +01:00
Erik Persson
4a07586076
state
2014-01-09 12:43:32 +01:00
Dennis Andersen
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
Erik Persson
f5490bf111
using a global id in object
2013-12-18 13:01:25 +01:00
dean11
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
Erik Persson
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
Erik Persson
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
dean11
3d973c16a2
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-03 12:09:22 +01:00
dean11
a852e8eab4
Created the game modules
2013-12-03 12:07:37 +01:00