4bb4e29515
More cleaning code
2015-12-17 13:23:15 +01:00
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
ba831f8a3c
WIP Cleaning
2015-12-17 10:59:55 +01:00
4c29e071af
Cleaned code
2015-12-17 10:47:08 +01:00
2cb5441b1c
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-17 09:47:15 +01:00
97a0d97b0b
Can now send transform components.
2015-12-16 17:56:44 +01:00
425f3ca3dd
Fixed "trying to read more than package size" warnings.
2015-12-16 16:49:18 +01:00
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
6eebce05af
Merge remote-tracking branch 'origin/Networking' into Networking
2015-12-16 14:58:36 +01:00
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
50ccf96268
Movement code not buggy anymore. Also changed package to not allocate more data than needed.
2015-12-16 13:52:16 +01:00
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
e74b2b6874
Made it easier for non network members to create packages and extract information from them by addin PopFrontString() and PopFrontPrimitive<type>().
2015-12-16 10:40:40 +01:00
3f602c9d63
Test code
2015-12-15 17:55:08 +01:00
082b3fd3df
Removed old input events from client
2015-12-15 17:22:46 +01:00
9b348a7d97
Updated movement code once again.
2015-12-15 16:50:59 +01:00
1669649186
Fixed bug with entityID. Also trying to fix movement WIP.
2015-12-15 16:24:09 +01:00
472a8db81a
Various bug fixes.
2015-12-15 15:32:31 +01:00
e940c1d604
WIP
2015-12-15 14:55:56 +01:00
478c692315
Refactoring. Client and server has Update Loop that runs before any game logic each frame.
2015-12-15 14:53:56 +01:00
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
bac0a1de26
Removed annoying cube
2015-12-14 16:55:23 +01:00
bf82bbb5d5
Merge remote-tracking branch 'origin/Networking' into Networking
2015-12-14 16:50:51 +01:00
e52052b431
IdentifyPacketLoss() crashed when multiple users connected which
...
also crashed the server. The function is not needed for now as the server logic is not
implemented.
2015-12-14 16:50:16 +01:00
8d9ff2b6dc
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-14 16:41:59 +01:00
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
36ae451ea6
Indentation
2015-12-11 16:22:14 +01:00
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
641a43b2ec
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-10 17:16:22 +01:00
58952725e9
Added class Package to help refactor the code. The code got easier to read.
2015-12-10 17:07:18 +01:00
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
f377d9ba70
Fixed client movement.
2015-12-10 14:14:36 +01:00
9a8f5293af
Can now Identify Packet Loss. Enumerated messages that loops around 0-1000.
2015-12-10 12:55:28 +01:00
663aca2641
Moved client and server from header.
...
Fixed so user are able to start a server and client on the same computer.
Starting 2 servers on the same computer will probably still crash the newest server (Don't do it).
2015-12-09 17:50:30 +01:00
4de613814b
WIP Packet loss identification. Put packetID in message
2015-12-09 17:43:36 +01:00
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
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
0e6353dd79
Fixed bug where closing glwindow as client crashed.
...
Server bug is still present.
2015-12-09 13:37:02 +01:00
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
f83e217638
Bugfix. if-statement was incorrect
2015-12-08 18:35:30 +01:00
58db7b755a
Random bugfixes and cleanup.
2015-12-08 18:24:08 +01:00
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
9f54a08536
Implemented new version of snapshot for 3D world. Also some cleanup.
2015-12-08 17:57:01 +01:00
24dada149f
Cleaned up code in Client.h and Client.cpp.
...
Moved ping code into Ping() function.
2015-12-08 17:18:03 +01:00
d1880754f5
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
2015-12-08 16:42:32 +01:00
27b44d2511
Input events for Client done. Instead of windows getAsyncKeyState();
2015-12-08 16:41:48 +01:00
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
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
e92119c99e
WIP trying to get Eventsystem to work in client.
2015-12-08 16:13:53 +01:00
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
stiffly
Jocke