2f259c3773
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-19 15:38:09 +01:00
46987beefb
Updated the serverlist, now prints adress and port of the server.
2016-02-17 17:05:10 +01:00
950ecba1c0
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-02-17 15:52:58 +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
0d665c10fe
Merge pull request #114 from teamfisk/HealthPickup
...
The rotation of the Pickups are now also included in the AmmoPickup.x…
2016-02-17 14:56:45 +01:00
b8222c7b2e
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
2016-02-17 14:54:42 +01:00
43bbc063cf
Merge pull request #111 from teamfisk/HealthPickup
...
Fixed RespawnModel of Pickups
2016-02-17 14:39:09 +01:00
3e4b87da7c
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 14:32:59 +01:00
ac9ce8ea83
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-17 14:30:31 +01:00
99643fd748
Merge pull request #112 from teamfisk/AssaultDash
...
You can now AssaultDash in the air
2016-02-17 14:24:58 +01:00
8f28c760dd
You can now AssaultDash in the air
2016-02-17 11:47:10 +01:00
b13362360a
Fixed RespawnModel of Pickups
2016-02-17 11:22:42 +01:00
Jace
0af9edc6e5
Editor is properly disabled when disabled in config
2016-02-17 10:53:20 +01:00
ec10ef3ffc
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-17 10:32:35 +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
Jace
969e7cb0d5
Merge remote-tracking branch 'origin/FixNetworkToPlayTest'
2016-02-12 09:18:32 +01:00
Jace
47a365a8fc
Inverted capture point numbers to fix HUD
2016-02-12 09:17:39 +01:00
Jace
71c03326aa
Debug.EditorEnabled
2016-02-12 09:17:28 +01:00
ba69c79821
Fixed bug in Server.
2016-02-12 09:13:43 +01:00
Jace
0a31fa3dfd
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-02-12 09:08:17 +01:00
Jace
ca457d9c00
Player names
2016-02-12 09:07:59 +01:00
a08e54a147
Blocked up a path in the Spawns a bit more.
2016-02-12 08:44:40 +01: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
10846be820
Merge pull request #109 from teamfisk/Sound
...
Added weapon sounds.
2016-02-12 08:23:30 +01:00
9df7b32ca1
Merge remote-tracking branch 'origin/master' into Sound
2016-02-12 08:20:01 +01:00
3d4a7de59d
MiniDump.cpp was not added to CMakeLists.txt.
2016-02-12 08:19:47 +01:00
1cdcbf9b32
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
2016-02-12 08:19:29 +01:00
9e8d2b99df
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 08:16:23 +01:00
ba4877c3f7
Moved Spawn locations and added ammo/health pickups around the map.
2016-02-12 08:16:12 +01:00
af39b892cd
Now plays a "Empty sound", "reload sound" and "hit mark sound" on appropriate occasions.
2016-02-12 08:05:35 +01:00
Jace
1ed5107d9b
Merge pull request #108 from teamfisk/MiniDump
...
Minidump on crash
2016-02-12 08:04:25 +01:00
2ce7179d19
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 07:49:58 +01:00
Jace
eb7b22c757
Latest assets
2016-02-12 07:48:26 +01:00
Jace
b48d491ad7
Complete blue and red player entities
2016-02-12 07:45:51 +01:00
7d732c75ca
Server now removes players that have disconnected.
2016-02-12 07:42:01 +01:00
Jace
47f4711b85
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 07:18:20 +01:00
Jace
78e318c032
Proper snapshot filtering
2016-02-12 07:14:36 +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
cc422cf73a
Fixed PlayerDeath being fired multiple times per frame on the server, causing multiple spawns and other weirdness
2016-02-12 06:30:19 +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
f146971db0
Fixed size
2016-02-12 05:45:17 +01:00
60b2c9bc9b
KillFeed
2016-02-12 05:41:05 +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
a8a3366e8a
Hopeless attempts to fix network bugs
2016-02-12 05:17:09 +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
422bedb844
MiniDump name now depends on time e.g. TacticalZ Fri 04-20-49.
2016-02-12 04:22:11 +01:00
1da432ba23
WIP sounds
2016-02-12 04:03:35 +01:00
stiffly
Tobias Dahl
verysecrethero
Jace
Jocke
antc13
viktorljung
William Moberg