Robin Engman
26e151f9b4
Fixed state problem
2014-02-10 15:46:55 +01:00
Robin Engman
ba0d6ca73a
Amazing merge with server
2014-02-10 12:42:31 +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
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
426444ca34
GL - added more boxes and weaponfunctionality
2014-02-05 11:46:04 +01:00
lindaandersson
6818dda2b9
GL - testing
2014-02-05 09:06:33 +01:00
lindaandersson
ec4d34b131
GL - added error checking
2014-02-04 16:39:01 +01:00
lindaandersson
d8c7220569
GL - added some testing things in player and more objects to the world
2014-02-04 16:08:28 +01:00
lindaandersson
d54cffee8e
GL - camera follows player
2014-02-04 11:50:15 +01:00
lindaandersson
fcadd5b4c3
GL - testing physics
2014-02-04 10:29:02 +01:00
lindaandersson
ab962eea99
GL - added error check
2014-02-03 16:20:05 +01:00
lindaandersson
a3886c4f1f
GL - added models and started to fix camera movement
2014-02-03 15:52:00 +01:00
lindaandersson
e327f64702
GL - can play with two characters
2014-01-31 16:33:16 +01:00
lindaandersson
7b503bcb52
GL - working with snap
2014-01-31 15:17:09 +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
16334ea2db
GL - collision working, going to merge with physics
2014-01-29 13:18:17 +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
1ed1bab751
Created test box that should now be shot at by the player
2014-01-27 13:55: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
Erik Persson
bd739f8acb
GL - Creation of objects kinda sorted
2014-01-23 09:14:04 +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
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
lindaandersson
561418c427
GL - gravity working
2014-01-21 14:28:27 +01:00
Dennis Andersen
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
lindaandersson
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +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
Erik Persson
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
Erik Persson
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +01:00
Dennis Andersen
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
Dennis Andersen
15d6ac8cf9
GameLogic - Final sprint2 merge
2013-12-20 09:42:02 +01:00
Erik Persson
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
Erik Persson
f5490bf111
using a global id in object
2013-12-18 13:01:25 +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
Linda Andersson
e658071643
GL- open a red window from lancher project
2013-12-04 11:32:43 +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