 Jocke
|
e0c3a32e66
|
Merge branch 'master' into TCPConnections
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/Server.h
# include/Game/Game.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Game/Game.cpp
|
2016-02-11 16:26:42 +01:00 |
|
|
Jocke
|
9645169797
|
Merge remote-tracking branch 'origin/master' into TCPConnections
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/Network.h
# include/Engine/Network/Packet.h
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Packet.cpp
# src/Engine/Network/Server.cpp
# src/Tests/HealthSystemTest.cpp
|
2016-02-10 17:05:07 +01:00 |
|
 Jace
|
d3bc48f5f7
|
Major networking refactoring to allow for snapshot filtering outside of netcode
|
2016-02-09 13:22:21 +01:00 |
|
|
Jocke
|
fccd8c64e7
|
WIP Clients are working properly, servers are not.
|
2016-02-09 11:43:16 +01:00 |
|
|
Jocke
|
6a3f585fb9
|
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
|
2016-02-02 13:26:15 +01:00 |
|
 stiffly
|
08fcdb382b
|
Used config for a lot of things
|
2016-01-22 13:18:53 +01:00 |
|
|
Jocke
|
6cd073c3c8
|
Added network metrics logging and reactored code.
|
2016-01-22 10:32:54 +01:00 |
|