lindaandersson
|
0c8783ba84
|
GL - merge done
|
2014-01-15 12:02: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 |
|
lindaandersson
|
0ffe26c134
|
GL - Merge client with gameserver
|
2014-01-15 08:18:06 +01:00 |
|
Dennis Andersen
|
82de85d1ac
|
Fixed minor server network bug, modified shader to get visual
|
2014-01-14 10:15:50 +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 |
|
Dennis Andersen
|
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 |
|
lindaandersson
|
792f78c34a
|
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
|
2014-01-13 12:11:45 +01:00 |
|
Dennis Andersen
|
2b5a5b2fbd
|
GameServer - Merge with gamelogic
|
2014-01-10 23:36:03 +01:00 |
|
lindaandersson
|
c541d032e7
|
GL - can move a obj on the client via the server
|
2014-01-10 10:47:54 +01:00 |
|
Dennis Andersen
|
a02a32c029
|
Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder
|
2014-01-09 14:18:01 +01:00 |
|
Dennis Andersen
|
42de421904
|
Master - Modified igore
|
2014-01-08 13:07:55 +01:00 |
|
Dennis Andersen
|
ed202a15a2
|
Worked over the holidays
|
2014-01-07 10:26:09 +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
|
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 |
Erik Persson
|
f4232ca0b4
|
gamplay code in gamesession
|
2013-12-20 08:59:59 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +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 |
|
Dennis Andersen
|
0570d76e24
|
Modified part of some player states
|
2013-12-19 12:41:37 +01:00 |
|
Dennis Andersen
|
beb116e964
|
Fixed some threafing and stuff
|
2013-12-19 12:32:23 +01:00 |
|
Erik Persson
|
e68001da0e
|
testing updated
message to client about object creation, message to client about player
movement
|
2013-12-19 11:46:11 +01:00 |
|
Linda Andersson
|
057dce0aca
|
GL - merge errors
|
2013-12-19 10:31:59 +01:00 |
|
Linda Andersson
|
13430f31fc
|
GL - merge and some more protocols
|
2013-12-19 10:22:32 +01:00 |
|
Erik Persson
|
0ea08fbd54
|
gamesession testing
|
2013-12-19 10:21:03 +01:00 |
|
Dennis Andersen
|
8721224d7c
|
GameLogic - Added alot of functionality to Game related parts
|
2013-12-18 13:07:10 +01:00 |
|
Dennis Andersen
|
347b546566
|
GameLogic - some minor fixes
|
2013-12-18 08:44:10 +01:00 |
|
Dennis Andersen
|
bf5cc69ff7
|
GameLogic - Added Postbox system to netsession
|
2013-12-18 08:37:45 +01:00 |
|
Dennis Andersen
|
097fa1da34
|
GameLogic - Pre merge with Linda
|
2013-12-17 14:15:20 +01:00 |
|
dean11
|
4650615a61
|
Gamelogic - Pre merge with Linda
|
2013-12-17 10:25:34 +01:00 |
|
dean11
|
7cda07507a
|
GameLogic - Pre merge with Netowkr
|
2013-12-16 09:50:23 +01:00 |
|
dean11
|
34d79d1207
|
Gamelogic - Forgot some stuff
|
2013-12-16 09:09:54 +01:00 |
|
dean11
|
9eb8fcba40
|
Gamelogic - Publication to others...
|
2013-12-16 09:00:11 +01:00 |
|
dean11
|
f29f50f830
|
Merged with Gamelogic branch and fixed errors and added features
|
2013-12-14 22:04:42 +01:00 |
|
dean11
|
8b1c2b91e8
|
Fixed some craches and stuff
|
2013-12-13 23:47:16 +01:00 |
|
dean11
|
4617523f8b
|
Gamelogic - Commit because branch switch
|
2013-12-12 20:32:54 +01:00 |
|
dean11
|
71d31db884
|
GAMELOGIC - Fixed a minor major huge issue with no problems
|
2013-12-12 14:37:35 +01:00 |
|
dean11
|
693b9df928
|
Some wierd stuff is going on here
|
2013-12-12 12:54:08 +01:00 |
|
dean11
|
9b9a92556a
|
Pre-merge with network, (again)
|
2013-12-12 12:17:39 +01:00 |
|
dean11
|
af7f0e01a8
|
Pre-network merge, (again)
|
2013-12-12 10:36:55 +01:00 |
|
dean11
|
fd3776a53b
|
GameLogic - Pre-network merge
|
2013-12-12 09:33:59 +01:00 |
|
dean11
|
64a8089e54
|
GameLogic - Worked on server
|
2013-12-04 11:37:26 +01:00 |
|
dean11
|
a852e8eab4
|
Created the game modules
|
2013-12-03 12:07:37 +01:00 |