9cbc582be2
Kinda works like before
2016-03-08 11:29:47 +01:00
68a88ed756
We are now using udp again
2016-03-07 16:07:54 +01:00
078d6eb712
Added sequnceNumber and totalNumberOfPackets to packet for packet splitting.
2016-03-07 14:22:09 +01:00
Jace
b7a7f7fd5e
????
2016-03-04 15:02:01 +01:00
eec40b6519
We can now read larger packets than 65536 bytes in TCPClient::readBuffer()
2016-03-04 05:10:18 +01:00
fe7c1dd808
Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard
...
# Conflicts:
# include/Engine/Network/Server.h
2016-03-03 23:56:57 +01:00
2167b6f7b1
Fix for previous commit..
2016-03-03 23:43:50 +01:00
0a21fe15dd
Merge remote-tracking branch 'origin/master' into ScoreBoard
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
2016-03-03 22:56:39 +01:00
714665f0a3
Updated the PlayerID getter in Server.cpp.
2016-03-03 22:55:12 +01:00
8466a282b7
The server will now parse a death event and pass it forward with a KillDeath event to the score system.
2016-03-03 22:48:42 +01:00
00c585de3c
Score should now track to all clients
2016-03-03 20:45:16 +01:00
7943fc7ad6
Hot fix: Infinite loop when a player disconnected from the server.
2016-03-03 18:14:33 +01:00
8b86c73ecc
Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard
2016-03-03 15:49:15 +01:00
a7bff92899
The readBuffer now checks if the whole packet has arrived before attempting to parse it.
2016-03-03 15:16:42 +01:00
a9b19d9af1
Packet write now only warns when a a packet is huge
2016-03-03 13:29:45 +01:00
ff6e2167d4
Some new events and changes to ScoreSystem
2016-03-03 11:25:06 +01:00
267c007291
Removed unnecessary comments, variables and functions.
2016-03-02 17:39:27 +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
afddd276a4
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
2016-02-26 16:54:09 +01:00
a48e1b567a
Removed comments
2016-02-26 16:49:25 +01:00
Jace
0c60b637c3
Who's merging without compiling?
2016-02-26 12:52:10 +01:00
d411de894f
Merge pull request #140 from teamfisk/FixNetworkBugs
...
Death explosion should always get triggered now.
2016-02-26 12:01:19 +01:00
18450ff4f3
Death explosion should always get triggered now. (I hope)
2016-02-26 11:08:05 +01:00
22b473a0b6
Merge pull request #139 from teamfisk/EditorCopyPaste
...
Editor copy paste
2016-02-26 11:01:18 +01:00
Jace
9e6c67596d
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
2016-02-25 17:51:28 +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
508d8a6f00
Fixed memory leak in TCPServer::AcceptNewConnections caused by acceptor->async_accept().
...
Fixed some formating and comments.
2016-02-25 14:24:38 +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
d77119bb2d
Fixed print for serverlist.
2016-02-23 11:47:44 +01:00
fc7d62a5ad
Various clean ups.
2016-02-23 11:07:56 +01:00
fe9dbf0b0f
Serverlist fix.
2016-02-23 10:33:20 +01:00
845a30ed0f
Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync
...
# Conflicts:
# include/Engine/Network/TCPServer.h
# src/Engine/Network/TCPServer.cpp
2016-02-22 17:39:48 +01:00
34a71b0767
Fixed linking issue.
2016-02-22 17:24:35 +01:00
833006744a
WIP
2016-02-22 17:00:25 +01:00
b2d8cddfb7
WE now send the map on connect after that only player information.
2016-02-22 16:46:31 +01:00
ed9149fe63
Network buffer should now dynamically increase when needed.
2016-02-22 16:04:27 +01:00
4c1a284636
Server now does Capture point logic too.
2016-02-22 11:30:31 +01:00
23dc8e07b2
Will this do the trick? Now tells the server to send HUD entities too.
2016-02-22 10:41:37 +01:00
c7d31cac2d
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-02-22 10:19:48 +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
2263fd2ad6
Fixed crash in Client::parsePlayerDamage.
2016-02-19 16:18:16 +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
4432891437
Fixed crash in Client::parsePlayerDamage.
2016-02-17 10:21:50 +01:00
a006db9e63
WIP Fix dsync
2016-02-16 16:06:17 +01:00
717af2c4a4
Fixed bug in Client::parsePlayerDamage()
2016-02-16 10:22:15 +00:00
Jocke
Jace
Tleety
stiffly
William Moberg