Dennis Andersen
|
40f0fe61f0
|
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
|
2014-01-31 08:41:08 +01:00 |
lindaandersson
|
05e24d0514
|
GL - uppdate server
|
2014-01-30 14:17:50 +01:00 |
|
lindaandersson
|
1ccf98e3eb
|
GL - added loginstate
|
2014-01-30 11:58:44 +01:00 |
|
lindaandersson
|
d41ddca45d
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-30 11:13:42 +01:00 |
|
Dennis Andersen
|
05740665da
|
GameServer - Fixed a small error regarding not reaching some data
|
2014-01-30 11:11:04 +01:00 |
|
lindaandersson
|
a249e7ede9
|
GL - merge with new serverAPI
|
2014-01-30 10:57:44 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +01:00 |
|
lindaandersson
|
7d9d8e4615
|
GL - added jump
|
2014-01-30 09:07:56 +01:00 |
|
Dennis Andersen
|
fa29cd7307
|
GameServer - Merged with GameLogic
|
2014-01-30 00:19:00 +01:00 |
|
lindaandersson
|
16334ea2db
|
GL - collision working, going to merge with physics
|
2014-01-29 13:18:17 +01:00 |
|
Dennis Andersen
|
36f057d2cc
|
Broekn branch not broekn more
|
2014-01-29 10:18:01 +01:00 |
|
lindaandersson
|
a56fcbcb9b
|
GL - can send object position from level objects, gravity and frustrum problems.
|
2014-01-28 15:04:25 +01:00 |
|
Dennis Andersen
|
91e825dbfb
|
Broekn stuff to tobias
|
2014-01-28 09:00:02 +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 |
|
lindaandersson
|
5b984db9ba
|
GL - gameState merge
|
2014-01-27 13:25:09 +01:00 |
|
lindaandersson
|
fb2cf714c6
|
GL - sending dir to server, forward and backward walking works
|
2014-01-23 14:28:53 +01:00 |
|
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
|
lindaandersson
|
f657a58a4f
|
GL - adding a camera on the client
|
2014-01-23 08:24:35 +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 |
|
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 |
|
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
|
0a41d20099
|
GameLogic - Merged with graphics
|
2014-01-20 16:36:25 +01:00 |
|
lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
lindaandersson
|
8557559b9b
|
GL - going to merge
|
2014-01-15 11:57:36 +01:00 |
|
lindaandersson
|
0ffe26c134
|
GL - Merge client with gameserver
|
2014-01-15 08:18:06 +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 |
|
lindaandersson
|
04c5898f4e
|
GL - sending string and createOBJ working
|
2014-01-14 09:24:55 +01:00 |
|
lindaandersson
|
792f78c34a
|
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
|
2014-01-13 12:11:45 +01:00 |
|
lindaandersson
|
c541d032e7
|
GL - can move a obj on the client via the server
|
2014-01-10 10:47:54 +01:00 |
|
Linda Andersson
|
16715f3f2a
|
GL - push before merge
|
2013-12-20 11:27:04 +01:00 |
|
Dennis Andersen
|
be39365a27
|
Gamelogic - Merged with existing stuff
|
2013-12-20 09:47:24 +01:00 |
|
Dennis Andersen
|
15d6ac8cf9
|
GameLogic - Final sprint2 merge
|
2013-12-20 09:42:02 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
|
Linda Andersson
|
ea59c25119
|
GL - mergeing error
|
2013-12-19 13:49:46 +01:00 |
|
Linda Andersson
|
bb61b83392
|
GL - merge
|
2013-12-19 13:46:01 +01:00 |
|
Dennis Andersen
|
d68fd63b25
|
Added server launcher
|
2013-12-19 13:35:56 +01:00 |
|
Linda Andersson
|
ba6f7114b5
|
GL - added id in object, vector
|
2013-12-19 11:58:42 +01:00 |
|
Linda Andersson
|
13430f31fc
|
GL - merge and some more protocols
|
2013-12-19 10:22:32 +01:00 |
|
Linda Andersson
|
a4907c8e2e
|
GL - control protocol added
|
2013-12-18 15:28:47 +01:00 |
|
Linda Andersson
|
0c98e2847d
|
GL - added some protocols
|
2013-12-18 12:18:01 +01:00 |
|
Linda Andersson
|
e16c939285
|
GL - using window manager, fixed consistent linking in danBiasGame
|
2013-12-18 10:47:30 +01:00 |
|
Linda Andersson
|
9d722bced3
|
GL - recieve messages from server
|
2013-12-17 13:39:10 +01:00 |
|
Linda Andersson
|
5d1d64bebb
|
GL - trying to send move protocol
|
2013-12-17 10:07:46 +01:00 |
|
Linda Andersson
|
dc3221ee11
|
GL - set pos function for C_models
|
2013-12-16 11:08:10 +01:00 |
|
Linda Andersson
|
fa1473455f
|
GL - added C_obj files, client obj in game state to send input
|
2013-12-16 09:45:12 +01:00 |
|
Linda Andersson
|
7c1d19946d
|
GL - Connection to network in clinet
|
2013-12-13 12:02:49 +01:00 |
|
Linda Andersson
|
22665bc44b
|
GL - started using network and protocols for sending/recieveing
|
2013-12-11 12:14:00 +01:00 |