NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,207 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

71 Commits

Author SHA1 Message Date
dean11 bb8d3549dc Cleanup 2014-02-17 09:01:01 +01:00
Dennis Andersen 5119af8127 Gameserver - Added more features to standalone srver 2014-02-17 08:53:15 +01:00
Dennis Andersen 85ebe3a7ca GameServer - Merged with Input, Added some athur info in headers 2014-02-16 01:38:03 +01:00
Dander7BD 805f90d926 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/LoginState.cpp
 2014-02-13 15:25:07 +01:00
Pontus Fransson 95e08e84c3 Network - Overloaded Connect in NetworkClient to use std::wstring. 2014-02-13 15:21:19 +01:00
Dander7BD 5d4d66cf06 stuff 2014-02-12 17:20:42 +01:00
Dander7BD 5ff8661843 Bugs and Compilation errors dealt with 2014-02-12 14:33:56 +01:00
Dander7BD 4d78e30fb8 Overhaul of GameState 2014-02-12 09:02:44 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Dennis Andersen 168539da08 Gameserver - Fixed minor merging isues 2014-02-04 16:27:18 +01:00
Dennis Andersen de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
Pontus Fransson dc5b408196 Network - Updated network api with comment. 2014-02-03 15:32:20 +01:00
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +01:00
Dennis Andersen c9c562fda6 GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Dennis Andersen 34b6b29fc4 GameLogic - Merged with GL 2014-01-31 09:24:16 +01:00
lindaandersson a6ff6eba42 GL - merge with server 2014-01-31 09:14:55 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Pontus Fransson 3b8a8e9c09 Network - Fixed receiving parts of packages. 2014-01-30 23:22:46 +01:00
Sam Mario Svensson 4167b6a93b GL- merge fix 2014-01-30 15:02:35 +01:00
Dennis Andersen 09f39ec26d GameServer - Added acces directly to clients in network session 2014-01-30 14:15:25 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +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
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +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
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
lindaandersson 0ffe26c134 GL - Merge client with gameserver 2014-01-15 08:18:06 +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
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 beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Erik Persson 4d7be753c5 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 08:32:20 +01:00
Erik Persson 8173f3818d gamelogic update and added some level design elements 
teammanager, team,
 2013-12-18 08:30:58 +01:00
Pontus Fransson d4e92d4bbe Network - Fixed clear string in Translator. 2013-12-18 00:21:00 +01:00
Pontus Fransson 623267ad1b Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 00:10:47 +01:00
Pontus Fransson 4df33b759c Network - char[] unpacking. 
Fixed correct unpacking on char[].
Fixed not clearing string in translator unpack function.
 2013-12-18 00:04:25 +01:00
Dennis Andersen 8700824d12 Gamlogic - Merge with Linda 2013-12-17 14:32:57 +01:00
Dennis Andersen 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +01:00
Linda Andersson 9d722bced3 GL - recieve messages from server 2013-12-17 13:39:10 +01:00
Dennis Andersen 682a28513b Gamelogic - Merge with network 2013-12-17 11:35:34 +01:00
Pontus Fransson 7c029a5242 Network - Fixed bugs 2013-12-17 10:58:07 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
Pontus Fransson f31da90830 Network - Connection set blocking to true while connecting. 2013-12-17 09:05:32 +01:00
dean11 abc94e9acb Nothing important done 2013-12-17 00:51:42 +01:00