7855cf03d2
The Endscreen now works over the network.
2016-03-13 23:33:10 +01:00
Jace
a715f7fe86
Merge branch 'master' into Movement
...
# Conflicts:
# include/Engine/Network/Client.h
# resources/DefaultConfig.ini
# resources/Schema/Entities/OverwatchCamera.xml
# resources/Schema/Types/Entity.xsd
2016-03-13 22:22:36 +01:00
20e48eeb08
Killfeed should work now.
2016-03-13 21:01:04 +01:00
5ea0f04b20
Added pop up for client when server timeouts.
2016-03-13 16:21:55 +01:00
b7d88808e2
Redid timers.
2016-03-12 21:38:46 +01:00
f8f536802f
Time for ending the game is now in CapturePointGameMode component. The timer i counted down to 0 and then the map is "Reset".
2016-03-12 20:28:48 +01:00
c544f349fd
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
2016-03-12 17:49:50 +01:00
0c1a2d3160
WIP
2016-03-12 14:31:15 +01:00
5f959ded89
Did changes upon pull request's request.
2016-03-11 12:54:59 +01:00
33627f917c
removed debug info.
2016-03-11 11:01:10 +01:00
9721cb6a7d
Merge remote-tracking branch 'origin/master' into SplitSnapshots
...
# Conflicts:
# include/Engine/Network/Client.h
# src/Engine/Network/Client.cpp
2016-03-09 19:14:10 +01:00
fa0b52caec
When you disconnect you will delete the world and return to the menu.
2016-03-09 15:49:42 +01:00
09171a1a18
WIP connect from menu
2016-03-09 14:33:20 +01:00
17e2ebeaa7
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
...
# Conflicts:
# include/Engine/Network/Client.h
2016-03-08 16:59:24 +01:00
3828616b60
Made it easier to maintain changes in packet header, prepared for reliable UDP packets.
2016-03-08 14:44:35 +01:00
68a88ed756
We are now using udp again
2016-03-07 16:07:54 +01:00
Jace
b7a7f7fd5e
????
2016-03-04 15:02:01 +01:00
a5c086e389
Dash effect now working over network, by sending events. Similar to jump effect.
2016-03-02 16:48:38 +01:00
aadfdfdd90
AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that
...
Client and it will update its ammo.
2016-03-01 17:55:00 +01:00
18450ff4f3
Death explosion should always get triggered now. (I hope)
2016-02-26 11:08:05 +01:00
eac9a9daf6
Pull request #136 Merge remote-tracking branch 'origin/master' into FixNetworkBugs
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-02-25 16:07:06 +01:00
059fe5c6c0
Fixed typo m_EPDoubleJump to m_EDoubleJump.
2016-02-25 16:04:27 +01:00
f66fa7a183
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
...
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/MessageType.h
# include/Engine/Network/Server.h
# include/Engine/Network/TCPServer.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/TCPServer.cpp
2016-02-25 15:13:11 +01:00
8ce6308649
In snapshot: now sends player information and also CP information. Now it is no longer true that they will arrive in pre order. Appropriate actions were therefor implemented.
2016-02-25 11:56:40 +01:00
fa13c1d065
Double jump is now working.
2016-02-23 18:24:46 +01:00
8a04e87494
The serverlist is displayed when pressing connect button.
2016-02-23 14:31:35 +01:00
833006744a
WIP
2016-02-22 17:00:25 +01:00
993d804cef
Added an event to search for servers.
...
Client now broadcasts a serverlistrequest.
An active server will then answer the request and send info about the server.
The client saves this data to a list and presents it to the user.
2016-02-22 10:05:47 +01:00
46987beefb
Updated the serverlist, now prints adress and port of the server.
2016-02-17 17:05:10 +01:00
fdc8f753cb
Implemented primitive server "heartbeat" logic, which sends server info from server to client without being connected.
2016-02-17 15:51:26 +01:00
Jace
bb66f95d43
Enabled server broadcasting PlayerDamage events to other players to make damage indicators work
2016-02-12 07:03:14 +01:00
afd9e24df6
Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...
2016-02-11 21:23:53 +01:00
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
eb244f87c4
Added disconnect functionality and removed some warnings.
2016-02-10 23:27:46 +01:00
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
4f2ad3ad00
Reliable message should now be working, further testing is to be done.
2016-02-10 16:16:56 +01:00
2ec30fd2b2
Cleaned up code and fixed crash when closing client before server when using udp.
2016-02-10 11:28:03 +01:00
Jace
d3bc48f5f7
Major networking refactoring to allow for snapshot filtering outside of netcode
2016-02-09 13:22:21 +01:00
fccd8c64e7
WIP Clients are working properly, servers are not.
2016-02-09 11:43:16 +01:00
88d7b79cd3
TCP and UDP Client are working for 1 connected player, more players are not tested yet
2016-02-05 18:30:31 +01:00
9232b24a7b
WIP Reliable message
2016-02-04 15:49:04 +01:00
e133791369
WIP Reliable Message
2016-02-03 10:28:15 +01:00
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
Jace
0fb1dbcae1
Client now has authority over its own absolute position and orientation until we have reliable input messaging
2016-01-24 19:00:50 +01:00
2eaad2aa00
Client now responds to deleted entity and component in server
2016-01-24 17:16:26 +01:00
Jace
4d5cbb6057
fixup! Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 12:14:29 +01:00
389e057611
EPlayerSpawned special logic added to server and client.
2016-01-22 17:49:21 +01:00
08c476e9e3
Added kick logic to the server. Also typedefed.
2016-01-22 15:42:36 +01:00
08fcdb382b
Used config for a lot of things
2016-01-22 13:18:53 +01:00
6cd073c3c8
Added network metrics logging and reactored code.
2016-01-22 10:32:54 +01:00
stiffly
Jace
Tleety
Jocke