Commit Graph

115 Commits

Author SHA1 Message Date
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 745268eeed Network - Removed line so it doesn't causes error. 2013-12-18 00:15:21 +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 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 cbf3c7db8f asd 2013-12-17 09:05:49 +01:00
Pontus Fransson f31da90830 Network - Connection set blocking to true while connecting. 2013-12-17 09:05:32 +01:00
Pontus Fransson 23a05bf431 Network - OysterByte += operator 2013-12-17 08:45:47 +01:00
dean11 abc94e9acb Nothing important done 2013-12-17 00:51:42 +01:00
Pontus Fransson e4e0e1c189 Network - Fixed delay loading dll. 2013-12-16 19:58:31 +01:00
dean11 ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient 2013-12-16 11:05:24 +01:00
Sam Mario Svensson 1c8f9c7801 Fixed link errors with dll files 2013-12-16 11:04:21 +01:00
Pontus Fransson 8a8cfcc5d6 Network - Forgot to use Initiateclient(). 2013-12-16 09:48:41 +01:00
Pontus Fransson 3a752f6b95 Network - Merge with gamelogic 2013-12-16 09:09:48 +01:00
dean11 9eb8fcba40 Gamelogic - Publication to others... 2013-12-16 09:00:11 +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 94ccd91828 Network - Added comments 2013-12-13 08:23:54 +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 092f83a084 Network - Id on client and == operator. 2013-12-12 15:33:11 +01:00
dean11 71d31db884 GAMELOGIC - Fixed a minor major huge issue with no problems 2013-12-12 14:37:35 +01:00
Pontus Fransson 94651ec77a Network - Added stop in listener destructor. 2013-12-12 14:14:48 +01:00
dean11 d0bd60c856 Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-12 12:23:55 +01:00
Pontus Fransson c661d26d2a Network - Not deleting smart pointers anymore. 2013-12-12 12:23:35 +01:00
dean11 a5ee468795 Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-12 12:17:52 +01:00
dean11 9b9a92556a Pre-merge with network, (again) 2013-12-12 12:17:39 +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 04436258a5 Network - Non-blocking 2013-12-12 09:24:57 +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 d27dcbe5b6 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-09 22:22:40 +01:00
Pontus Fransson 2cb8bbd8a9 Network - IServer running on separate thread.
IServer accepting clients.
2013-12-09 22:22:05 +01:00
dean11 9d264b0d89 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-09 14:24:12 +01:00
dean11 5473c5160f NETWORK - Modified the protocol creation structure 2013-12-09 14:23:30 +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