Commit Graph

89 Commits

Author SHA1 Message Date
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 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
Dennis Andersen 82de85d1ac Fixed minor server network bug, modified shader to get visual 2014-01-14 10:15:50 +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
Pontus Fransson 623267ad1b Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 00:10:47 +01:00
Pontus Fransson fc8dba6610 Network - Fixed Unpackb.
Changed Unpackb to "*buffer" instead of "buffer".
2013-12-18 00:08:50 +01:00
Pontus Fransson e1d0150ef1 Network - OysterByte += should now work correctly. 2013-12-18 00:07:24 +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 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +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 23a05bf431 Network - OysterByte += operator 2013-12-17 08:45:47 +01:00
Pontus Fransson 3a752f6b95 Network - Merge with gamelogic 2013-12-16 09:09:48 +01:00
Pontus Fransson 7acb3a3613 Network - 2013-12-16 08:59:38 +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 2ddb984a2b Network - Fixed bugg, and small fixed
Using sizeof in MessageHeader class.
Fixed bugg in Translator.
2013-12-13 08:17:05 +01:00
dean11 4617523f8b Gamelogic - Commit because branch switch 2013-12-12 20:32:54 +01:00
Pontus Fransson 94651ec77a Network - Added stop in listener destructor. 2013-12-12 14:14:48 +01:00
Pontus Fransson e9b41f8cb8 Network - Fixed copy construct 2013-12-12 12:14:53 +01:00
Pontus Fransson bbe59836da Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-11 21:45:51 +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
dean11 d95d771c43 Network - Merged with Gamelogic 2013-12-10 14:00:20 +01:00
Pontus Fransson e06ee31754 Network - First basic API. 2013-12-10 08:32:08 +01:00
Pontus Fransson 2cb8bbd8a9 Network - IServer running on separate thread.
IServer accepting clients.
2013-12-09 22:22:05 +01:00
Pontus Fransson b72fb21b07 Network - Fixed all thread related crashes.
The crashes was caused by OysterMutex, so i changed all OysterMutex to
std::mutex instead.
2013-12-09 10:48:43 +01:00
Pontus Fransson a79dc61159 Network - Stuff 2013-12-08 23:56:17 +01:00
Pontus Fransson bbb79a4ba9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-06 10:46:05 +01:00
Pontus Fransson 5465ccf51a Network - Started implementing Server,client,session. 2013-12-06 10:45:53 +01:00
Sam Mario Svensson cc793851af Network- set blocking mode 2013-12-04 14:59:00 +01:00
Pontus Fransson df1594a43b Network - Fixed small errors 2013-12-04 14:58:15 +01:00
Pontus Fransson e81062b875 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-04 12:41:37 +01:00
Pontus Fransson f0dff0b728 Network - Starting to implement correct shutdown connection. 2013-12-04 12:41:25 +01:00
Sam Mario Svensson 79cf9df111 Network - changed from & to smartpoints 2013-12-04 12:40:49 +01:00
lanariel f29af8b8bd Release Now Stable 2013-12-04 09:36:43 +01:00
Pontus Fransson df1470eb2c Network - Send/Recv both ways.
Impl: SetBlockingMode() : Connection.
Impl: Resize() : OysterByte.
Remade Clear() : OysterByte.
Added bool return if FetchMessage() succeded or failed : PostBox.
Fixed a few errors with mutex on ThreadedClient.
Added missing mutex unlock in ThreadSafeQueue.
2013-12-03 23:12:48 +01:00
Pontus Fransson e837b80e43 Network - Fixed warning, made functions private.
Fixed warnings.
Made functions regarding the thread private in listener.
2013-12-03 13:20:50 +01:00
Sam Mario Svensson 1466c0db31 Network - projectfile fix 2013-12-03 13:16:44 +01:00
Sam Mario Svensson aa19002cbe Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
2013-12-03 13:12:17 +01:00
Sam Mario Svensson 10c1dc57f3 merge fix 2013-12-03 13:08:04 +01:00
Sam Mario Svensson aa4cf634d3 Client interface and class for both server and client. now using postbox system 2013-12-03 13:04:53 +01:00
Pontus Fransson d78b48319d Network - Added MessagePlayerPos
Added MessagePlayerPos
Fixed bugg with adding float array.
2013-12-03 11:46:46 +01:00
Sam Mario Svensson 3c681352da Documentation of the code done by Sam 2013-11-29 09:19:14 +01:00
Pontus Fransson 407f3c5c9a Added documentation and removed unecessesary code. 2013-11-29 09:11:30 +01:00