Jace
b6fd18baed
Hacked in serverside effects
2016-01-25 11:56:40 +01:00
Jace
d0de169613
Instagib!
2016-01-24 23:05:52 +01:00
Jace
0c56a05144
Merge branch 'master' of github.com:teamfisk/TacticalZ
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Engine/Network/Server.cpp
2016-01-24 21:21:51 +01:00
Jace
382eff169f
Server refactoring to remove player dependency and lots of fixes.
2016-01-24 21:20:43 +01:00
Jace
25890c8d6c
Merge remote-tracking branch 'origin/Networking'
2016-01-24 19:01: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
Jace
b4081b3e45
Merge remote-tracking branch 'origin/Networking'
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-24 18:36:37 +01:00
8d61632c26
No longer spawns a f**king sphere.
2016-01-24 17:40:43 +01:00
2eaad2aa00
Client now responds to deleted entity and component in server
2016-01-24 17:16:26 +01:00
Jace
235b26ad61
WIP shoot
2016-01-24 17:16:18 +01:00
aa20b48188
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
2016-01-24 16:22:22 +01:00
4c5d17b203
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
2016-01-24 14:40:52 +01:00
97d70f8e32
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
2016-01-24 11:36:01 +01:00
3baa988ad4
Changed .obj files to our own format. DummyScene.mesh may be broken.
2016-01-23 20:35:58 +01:00
2bf0434bcb
Remade Snapshot logic from component based to entity based.
2016-01-23 16:40:38 +01:00
406b730ef3
Sends entity names. Temporarily
2016-01-22 19:07:20 +01:00
b37b20b7d8
Didn't bulid lol. Fixed.
2016-01-22 17:57:31 +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
fcc9d64e7a
Now publishes an EPlayerDisconnected event
2016-01-22 10:58:10 +01:00
7a95880e10
Merge remote-tracking branch 'origin/master' into Networking
2016-01-22 10:36:11 +01:00
6cd073c3c8
Added network metrics logging and reactored code.
2016-01-22 10:32:54 +01:00
973ccd34c9
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
2016-01-21 16:30:07 +01:00
cd67253173
Added logic to go from spectator to player.
2016-01-20 17:41:16 +01:00
00588b07c5
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
2016-01-20 16:30:12 +01:00
3376f4a16e
Added server has timed out logic to client. (>'')>
2016-01-20 16:27:53 +01:00
25d2aa3464
"Supporting" spectators. Using a vector for connected units as we do not interpret as players. ““”̿ ̿ ̿ ̿ ̿’̿’̵͇̿̿з=(•̪●)=ε/̵͇̿̿/̿ ̿ ̿ ̿ ̿’““
2016-01-20 16:27:23 +01:00
4d01cdf895
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-01-20 14:33:17 +01:00
7e7ca7edcf
Listening to "DisconnectFromServer"
2016-01-20 14:32:04 +01:00
e9a576341e
Started on server disconnect logic.
2016-01-20 14:31:50 +01:00
f52cddb445
Added packet loss logic for multiple clients.
...
Changed packet class to fit our needs.
2016-01-20 13:43:11 +01:00
386e76f642
Puyshing
2016-01-20 09:49:54 +01:00
e0c4394f20
Merge. Also fixed interpolation for scale and rotation.
...
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# src/Game/CMakeLists.txt
# src/Game/Game.cpp
2016-01-19 14:04:25 +01:00
a6425160fd
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Game/InterpolationSystem.h
# src/Game/InterpolationSystem.cpp
2016-01-18 18:13:19 +01:00
88eb3ca2db
Scraping queues for interpolation
2016-01-18 18:07:59 +01:00
14b1d541dc
Merge remote-tracking branch 'origin/Networking' into Networking
2016-01-18 17:34:32 +01:00
765509b510
Added interpolationsystem to pipeline.
2016-01-18 17:34:17 +01:00
fc305f8bf4
Merge remote-tracking branch 'origin/Networking' into Networking
2016-01-18 17:27:55 +01:00
70cbb02cb2
Merge remote-tracking branch 'origin/Networking' into Networking
2016-01-18 17:13:10 +01:00
0c7f2c5198
WIP implemented Interpolation (server logic)
2016-01-18 17:12:42 +01:00
6ba6deb863
Removed some debug spam.
2016-01-18 11:35:35 +01:00
cc604f8e9a
Merge remote-tracking branch 'origin/Networking' into Networking
2016-01-18 11:06:51 +01:00
e97f4a3563
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Game/Game.cpp
2016-01-18 11:06:27 +01:00
d995713d3b
Added input queue to Client and Input Listener debug code in server.
2016-01-18 11:06:02 +01:00
db62d767ac
Fixed bug in Client::parseSnapshot().
2016-01-15 12:06:20 +01:00
696f44a673
Added logic for mapping between ServerEntityIDs and LocalEntityIDs removed old code that wasn't used.
...
Added 1 map to Client and renamed m_ServerToClientMap to m_ServerIDToClientID.
// Good to know
To keep this structure please use insertIntoServerClientMaps() when adding items to them.
m_ServerIDToClientID and m_ClientIDToServerID maps between server EntityIDs and local EntityIDs.
To see if a local EntityID exist in m_ClientIDToServerID use clientServerMapsHasEntity(EntityID clientEntityID);
To see if server EntityID exist in m_ServerIDToClientID use serverClientMapsHasEntity(EntityID serverEntityID);
2016-01-14 17:11:54 +01:00
db18a45368
We are now sending EPlayerDamage events.
...
Client now listens to EPlayerDamage events and send them to Server.
Server publishes EPlayerDamage events received from Client.
2016-01-14 10:16:11 +01:00
a060640da3
Removed unnecessary unnecessary if in Client::OnInputCommand.
...
Change name from Server::parseEvent to Server::parseOnInputCommand
2016-01-13 18:00:12 +01:00
f47f913bf5
Added logic for sending input from Client to Server.
...
Fixed so that snapshots set their parent correctly. Will get problems if we have more components
than unsigned int max size, but that was already a problem.
Client now maps Entitys received from server with local Entitys by mapping their EntityIDs.
2016-01-13 16:09:16 +01:00
Jace
stiffly
antc13
Jocke
verysecrethero