Jace
01db8e0615
Merge remote-tracking branch 'origin/master' into Dirtybit
...
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
2016-03-12 04:09:53 +01:00
Jace
80649ce51d
Updated the ENTIRE CODEBASE TO MATCH
2016-03-12 00:38:33 +01:00
5f959ded89
Did changes upon pull request's request.
2016-03-11 12:54:59 +01:00
7febb7681c
Merge remote-tracking branch 'origin/master' into SplitSnapshots
2016-03-11 11:05:41 +01:00
33627f917c
removed debug info.
2016-03-11 11:01:10 +01:00
a8a4b5d2a2
Disconnect on udp
2016-03-10 15:59:55 +01:00
bdcb33d992
Mouse always unlocked on game start and on disconnecting (i.e when menu shows).
2016-03-10 12:46:06 +01:00
37355b1afc
Hot fix
2016-03-09 20:12:08 +01:00
5a7034dfcd
popped the right amount of the header
2016-03-09 19:43:18 +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
3209e36176
We can now send more data with UDP than previously, the splitting seems to work fine but receiving has some problems.
2016-03-09 18:26:33 +01:00
fdc37a9fe9
Loads the correct menu
2016-03-09 17:49:04 +01:00
fa0b52caec
When you disconnect you will delete the world and return to the menu.
2016-03-09 15:49:42 +01:00
1211888ce1
The world is deleted upon connection to a server.
2016-03-09 15:10:32 +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
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
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
a48e1b567a
Removed comments
2016-02-26 16:49:25 +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
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
8a04e87494
The serverlist is displayed when pressing connect button.
2016-02-23 14:31:35 +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
833006744a
WIP
2016-02-22 17:00:25 +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
2c3122bbdb
increased Network buffer size, fixed 2 crashes and re-added the ability to kill oneself with the use of a key bound to TakeDamage,Value.
2016-02-12 08:39:20 +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
Jace
2e5ee633ce
Fixed bug when client would recieve input command from an entity that the client didn't know about
2016-02-12 06:10:20 +01:00
1e04244590
Fixed network bug sorta
2016-02-12 06:00:42 +01:00
d357e365cb
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
...
# Conflicts:
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
2016-02-12 05:21:00 +01:00
7de76376cf
Merge remote-tracking branch 'origin/master' into TCPConnections
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 05:16:30 +01:00
Jace
5295133311
Hack to sync ammo over network until we have input replaying + Reload effect from all views
2016-02-12 01:45:54 +01:00
Jace
Jocke
William Moberg
stiffly
Tleety