Commit Graph

152 Commits

Author SHA1 Message Date
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
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
dean11 cb8fee9227 NETWORK - Added network custom protocol 2013-12-06 10:00:58 +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
Sam Mario Svensson 1cbdb0bcfa cleanup commented section in ClientMain 2013-11-29 08:59:36 +01:00
Pontus Fransson 8dab865cb6 Changed to our own Queue 2013-11-28 16:20:50 +01:00
Pontus Fransson 1453d81a9d Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 16:15:41 +01:00
Pontus Fransson 1617606145 PostBox
Created PostBox and IPostBox.
Listener post new clients to PostBox.
2013-11-28 16:15:28 +01:00
Sam Mario Svensson 23fa090296 Threadsafe Queue implemented with IQueue interface
threadsafe by using mutex lock in the Queue
2013-11-28 16:14:59 +01:00
Pontus Fransson 0c40ca1be5 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 08:52:22 +01:00
Pontus Fransson 00e02b6909 Removed OysterMath from OysterNetworkClient 2013-11-28 08:52:11 +01:00
Sam Mario Svensson a59cd54688 enum type naming fixed continued. 2013-11-28 08:51:21 +01:00
Sam Mario Svensson d29046652e enum type naming fixed 2013-11-28 08:40:38 +01:00
Pontus Fransson 6e24acea2b Listener's Accept() is now threaded.
Added function private to Connection SetBlockingMode(bool blocking); But
it doesn't do anything yet.
Listener is now accepting clients in a thread.
GetNewClient() returns the socket that has connected. -1 if there is no
new client connected. (Can only connect 1 client at a time.)
The simple chat program is not working anymore because of changes in the
server.
2013-11-27 14:33:08 +01:00
Pontus Fransson 43b111f0d3 Pull MiscBranch 2013-11-27 11:28:11 +01:00
Pontus Fransson aeddc032d9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/NetworkDependencies/IConnection.h
	Code/Network/OysterNetworkClient/Client.cpp
	Code/Network/OysterNetworkClient/Client.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/Client.cpp
	Code/Network/OysterNetworkServer/Client.h
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-27 11:06:03 +01:00
Pontus Fransson 214e29e906 OysterByte
Added Byte class instead of handling byte messages manually.
Converted all functions to use OysterByte.
2013-11-27 11:01:22 +01:00
Sam Mario Svensson f6ade9e4fd ErrorMessages everywhere! 2013-11-26 13:45:03 +01:00
Pontus Fransson 45c145439a Fixade crash och flyttade initsockets, shutdownsockets.
Moved initsocket and shutdownsockets to WinsockFunctions.
2013-11-25 20:27:23 +01:00
Pontus Fransson 6b57815bb8 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
2013-11-25 19:05:28 +01:00
Pontus Fransson caabb6702e Fixed code standard, Added packing functions 2013-11-25 19:00:33 +01:00
Sam Mario Svensson ca5e578af5 reconstruction in connection. 2013-11-25 14:03:32 +01:00
Sam Mario Svensson 82b8ef7b05 Fixed connection split up connect function and added initiateClient() 2013-11-25 12:14:01 +01:00
Sam Mario Svensson 640ac2172a checked the coding standard and changed it accordinly 2013-11-25 11:39:54 +01:00
Pontus Fransson ad7091e520 Fixed automatic size on Messages 2013-11-22 15:48:49 +01:00
Pontus Fransson 6eff55e763 Fixed possible crash 2013-11-22 14:31:07 +01:00
Pontus Fransson d33220f8ca Fixed memory leaks
Fixed memory leaks.
2013-11-22 14:23:08 +01:00
Pontus Fransson 623cffced6 Added protocols to an enum
Now we don't have to type cast
2013-11-22 11:40:55 +01:00
Sam Mario Svensson 9e6593abd1 bug med reference på typecast 2013-11-22 09:49:48 +01:00
Pontus Fransson c5e432b566 Fixed size 2013-11-22 09:43:24 +01:00
Pontus Fransson bacb83b084 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-22 09:24:44 +01:00
Pontus Fransson 5265fd1af1 Fixed merge errors 2013-11-22 09:17:07 +01:00
Pontus Fransson 954a1ac669 Fixed error
Fixed translation
2013-11-22 08:56:00 +01:00
Sam Mario Svensson 4142688f6c unsigned char instead of char and chat program with protocols 2013-11-22 08:54:26 +01:00
Pontus Fransson dcf456ce6d Fixed implementation of Translator 2013-11-21 14:49:30 +01:00
Pontus Fransson 7c417dd223 Merge 2013-11-21 13:46:25 +01:00
Pontus Fransson 87e1cf0436 Added Message base class
Packing functions,
MessageHeader; MessageTest,
2013-11-21 13:42:38 +01:00
Sam Mario Svensson f77efb107d Implemented Translator
also fixed some coding standards with namespaces in client, connection,
listener, server.
added protocols with enums for packagetype.
2013-11-21 13:40:52 +01:00
Pontus Fransson 5bcc285141 Sending empty strings, prints messages on server 2013-11-20 10:34:05 +01:00
Sam Mario Svensson 58efe7fdd3 getline fix in chat program 2013-11-19 14:59:00 +01:00
Pontus Fransson 816dced937 Chat test server 2013-11-19 14:24:38 +01:00
Sam Mario Svensson 1df11becf7 chat test with server
created simple chat program for the client to be able to chat between
client through a server
2013-11-19 14:18:34 +01:00
Pontus Fransson ac75e178ce Sending a message from server to client (done and done) 2013-11-19 13:42:50 +01:00
Sam Mario Svensson adcef51227 third time is the charm
fixed send and recieve functions in IConnection
2013-11-19 12:55:54 +01:00
Sam Mario Svensson 89ce3dd0d1 Fixed IConnection and Connection 2013-11-19 12:41:58 +01:00
Sam Mario Svensson 56c32fcbc3 Iconnection interface 2013-11-19 12:38:13 +01:00
Pontus Fransson c04593b575 Changed name on main files on server and client 2013-11-19 09:34:24 +01:00
Pontus Fransson 1022b15ea2 Removed stuff from project files 2013-11-18 16:47:57 +01:00