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 |
Dennis Andersen
|
1e89bb4e30
|
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
|
2014-01-29 15:01:14 +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
|
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 |
|
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
|
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 |
|
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 |
|
Erik Persson
|
80204ecbe3
|
GL - Massdriver usage of applyeffect
|
2014-01-22 13:02:13 +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
|
561418c427
|
GL - gravity working
|
2014-01-21 14:28:27 +01:00 |
|
Dennis Andersen
|
f7f59e8ac8
|
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
|
2014-01-21 09:52:48 +01:00 |
|
Dennis Andersen
|
386b27e2f7
|
GameLogic - Merge with sprint2.5
|
2014-01-20 16:17:01 +01:00 |
|
Dennis Andersen
|
1a3c63cda9
|
GameLogic - fixed some minor merging errors
|
2014-01-20 16:02:26 +01:00 |
|
Dennis Andersen
|
ab2a3a3892
|
GameLogic - fixed some minor merging errors
|
2014-01-20 16:01:54 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |
|
lindaandersson
|
a1128986d5
|
Merge with Gamle Logic
|
2014-01-20 11:59:43 +01:00 |
|
Erik Persson
|
ce4c57bab3
|
GL - player inherits dynamicobject instead of object
|
2014-01-20 08:40:41 +01:00 |
|
Erik Persson
|
eaf0ae1479
|
GL - can now compile
|
2014-01-17 08:52:34 +01:00 |
|
lindaandersson
|
7b2be02113
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-16 12:26:33 +01:00 |
|
lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
Erik Persson
|
d08e999f07
|
Create level and initiate it with a rigidbody etc
|
2014-01-16 12:08:24 +01:00 |
|
Erik Persson
|
225d8912da
|
GL - make rigidbody level
|
2014-01-16 11:40:29 +01:00 |
|
Erik Persson
|
0080a9f6f2
|
small name changes
|
2014-01-16 11:17:19 +01:00 |
|
Erik Persson
|
567fa229eb
|
small name changes
|
2014-01-16 11:07:45 +01:00 |
|
lindaandersson
|
0c8783ba84
|
GL - merge done
|
2014-01-15 12:02:52 +01:00 |
|
lindaandersson
|
8557559b9b
|
GL - going to merge
|
2014-01-15 11:57:36 +01:00 |
|
Dennis Andersen
|
5f00aa7af7
|
GL - Merge with origin/Gamelogic
|
2014-01-15 11:45:34 +01:00 |
|
Erik Persson
|
208482b0ce
|
GL merge error
|
2014-01-15 11:25:59 +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 |
|
lindaandersson
|
9a32c44e49
|
GL - Merge branch 'GameLogic'
|
2014-01-15 08:19:35 +01:00 |
|
Dennis Andersen
|
54babfc7c7
|
Gameserver - Merged with Gamelogic
|
2014-01-14 10:38:35 +01:00 |
|
Erik Persson
|
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 |