Commit Graph

47 Commits

Author SHA1 Message Date
Jocke 97f8be1915 Made Network.h's Start() and Update pure virtual and removed cpp.
Removed unnecessary code from NetworkDefinitions.h.
Renamed sizeOfPackage to sizeOfPacket in Packet.cpp.
2015-12-18 10:21:56 +01:00
Jocke 0eb51a0fea Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	include/Engine/Network/Packet.h
#	src/Engine/Network/Packet.cpp
2015-12-18 10:16:31 +01:00
Jocke db5b6ad519 Added more error code to Packet class 2015-12-17 17:32:49 +01:00
stiffly 076030a252 Fixes, mostly name changes 2015-12-17 17:28:43 +01:00
stiffly 4bb4e29515 More cleaning code 2015-12-17 13:23:15 +01:00
stiffly a6a08f48bb Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp
2015-12-17 11:24:34 +01:00
stiffly ba831f8a3c WIP Cleaning 2015-12-17 10:59:55 +01:00
stiffly 4c29e071af Cleaned code 2015-12-17 10:47:08 +01:00
Jocke 2cb5441b1c Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	src/Engine/Network/Client.cpp
2015-12-17 09:47:15 +01:00
stiffly 97a0d97b0b Can now send transform components. 2015-12-16 17:56:44 +01:00
Jocke 6da5fd1263 Restructured code and added bool to stop client from spamming Snapshots to a server when
it wasn't connected to one.
2015-12-16 15:47:51 +01:00
Jocke 6eebce05af Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-16 14:58:36 +01:00
Jocke 58a9d38e26 Added a class that client and server inherits from.
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
2015-12-16 14:56:53 +01:00
stiffly 50ccf96268 Movement code not buggy anymore. Also changed package to not allocate more data than needed. 2015-12-16 13:52:16 +01:00
stiffly a2d55feed1 Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
2015-12-16 11:12:15 +01:00
stiffly 082b3fd3df Removed old input events from client 2015-12-15 17:22:46 +01:00
Jocke e940c1d604 WIP 2015-12-15 14:55:56 +01:00
stiffly 478c692315 Refactoring. Client and server has Update Loop that runs before any game logic each frame. 2015-12-15 14:53:56 +01:00
stiffly b698a0d36f WIP
Adding models now crashes. Threading
Added a create player event that currently is not used.
2015-12-15 11:21:46 +01:00
Jocke 63db236dfa Fixed bug which made the player not able to move diagonally.
Fixed a bug were m_PlayerID was not set for the client when connecting.
2015-12-14 16:35:43 +01:00
Jocke 01d7388f91 Reactored the package loss logic.
Server cannot handle multiple clients yet.
Fixed WorldTest code by adding astrix.
2015-12-11 11:55:23 +01:00
stiffly 641a43b2ec Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	src/Engine/Network/Client.cpp
2015-12-10 17:16:22 +01:00
stiffly 58952725e9 Added class Package to help refactor the code. The code got easier to read. 2015-12-10 17:07:18 +01:00
Jocke 99543a300d Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
#	include/Engine/Network/NetworkDefinitions.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Game/Game.cpp
2015-12-10 14:40:06 +01:00
Jocke f377d9ba70 Fixed client movement. 2015-12-10 14:14:36 +01:00
stiffly 9a8f5293af Can now Identify Packet Loss. Enumerated messages that loops around 0-1000. 2015-12-10 12:55:28 +01:00
stiffly 4de613814b WIP Packet loss identification. Put packetID in message 2015-12-09 17:43:36 +01:00
Jocke 0807a7d0ae Fixed the bug where starting a server made the program crash on closing.
Fixed some memory leaks in Client.cpp.
2015-12-09 14:43:43 +01:00
Jocke ba150a264c Fixed bug that cause the program to crash when closing if a server had been started.
Removed memory leaks in Client.cpp.
2015-12-09 14:41:26 +01:00
Jocke 0e6353dd79 Fixed bug where closing glwindow as client crashed.
Server bug is still present.
2015-12-09 13:37:02 +01:00
stiffly 247ff09743 Smoother movement over network. Some refactoring on client side. Now uses EKeyUp to determine if a key is pressed. 2015-12-09 13:02:39 +01:00
stiffly 2a35c3055e Renamed NetworkDefines.h --> NetworkDefinitions.h 2015-12-09 11:08:57 +01:00
stiffly 58db7b755a Random bugfixes and cleanup. 2015-12-08 18:24:08 +01:00
stiffly a8c0a1f294 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp
2015-12-08 18:07:18 +01:00
stiffly 9f54a08536 Implemented new version of snapshot for 3D world. Also some cleanup. 2015-12-08 17:57:01 +01:00
Jocke 24dada149f Cleaned up code in Client.h and Client.cpp.
Moved ping code into Ping() function.
2015-12-08 17:18:03 +01:00
Jocke d1880754f5 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 2015-12-08 16:42:32 +01:00
stiffly 27b44d2511 Input events for Client done. Instead of windows getAsyncKeyState(); 2015-12-08 16:41:48 +01:00
Jocke 94adaf8ae3 Added support for multiplayer.
Reactored code, clumped together variables in PlayerDefinition.h.
Integrated server with entity system.
2015-12-08 16:41:22 +01:00
stiffly 6dc5112c26 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp
2015-12-08 16:15:50 +01:00
stiffly e92119c99e WIP trying to get Eventsystem to work in client. 2015-12-08 16:13:53 +01:00
Jocke c48c9e1f86 Added leak check when using windows (WinLeakCheck.h).
Added server to project.
A server can now be started in the project.
2015-12-08 13:54:18 +01:00
Jocke b5a010a517 Network now runs on it's own thread.
Network now sends Disconnect message when game is terminated.
2015-12-08 11:02:40 +01:00
stiffly 2c993e82d6 Added the old prototype logic to Client.h. Can now communicate with a external server(on prototype). 2015-12-07 16:55:12 +01:00
stiffly cbbb7deaea Copy pasta error. Corrected #ifndef 2015-12-07 16:53:33 +01:00
stiffly d8d63f804a Added utility headers for network interface. 2015-12-07 16:11:27 +01:00
sippeangelo 6991a2be26 Renamed Networking -> Network 2015-12-07 15:22:26 +01:00