Commit Graph

25 Commits

Author SHA1 Message Date
Pontus Fransson d64f3d7a20 Broadcasting works and I am getting the protocols out to LanMenuState! 2014-02-23 20:23:15 +01:00
Dennis Andersen f872cfffd1 Added debug project to game server and some other stuff 2014-02-20 08:33:07 +01:00
Pontus Fransson ca2695293f Added reconnect (not tested). Added check for level parser not finding file. 2014-02-19 09:25:40 +01:00
Dennis Andersen 5b4758d2ae Broekn 2014-02-18 08:55:38 +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 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 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
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +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 ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +01:00
dean11 ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient 2013-12-16 11:05:24 +01:00
dean11 9eb8fcba40 Gamelogic - Publication to others... 2013-12-16 09:00:11 +01:00
dean11 17aa38d865 GameLogic - Merge with network, resolved 2 merging errors 2013-12-14 22:54:24 +01:00
dean11 8b1c2b91e8 Fixed some craches and stuff 2013-12-13 23:47:16 +01:00
Pontus Fransson 94ccd91828 Network - Added comments 2013-12-13 08:23:54 +01:00
Pontus Fransson 092f83a084 Network - Id on client and == operator. 2013-12-12 15:33:11 +01:00
Pontus Fransson e9b41f8cb8 Network - Fixed copy construct 2013-12-12 12:14:53 +01:00
Pontus Fransson 49cfbbebd5 Network - Changed to CustomProtocolObject on send. 2013-12-12 10:32:43 +01:00
Pontus Fransson 5a3188d5f6 Network - NetworkServer, NetworkClient, Translator
First version of the NetworkAPI. It should work.
2013-12-11 21:45:43 +01:00
Pontus Fransson e06ee31754 Network - First basic API. 2013-12-10 08:32:08 +01:00