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
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
8f28c760dd
You can now AssaultDash in the air
2016-02-17 11:47:10 +01:00
a006db9e63
WIP Fix dsync
2016-02-16 16:06:17 +01:00
Jace
969e7cb0d5
Merge remote-tracking branch 'origin/FixNetworkToPlayTest'
2016-02-12 09:18:32 +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
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
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
Jace
b48d491ad7
Complete blue and red player entities
2016-02-12 07:45:51 +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
bb66f95d43
Enabled server broadcasting PlayerDamage events to other players to make damage indicators work
2016-02-12 07:03:14 +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
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
1da432ba23
WIP sounds
2016-02-12 04:03:35 +01:00
Jace
787eecce26
WIP
2016-02-12 04:03:22 +01:00
215b1b1aa4
On crash, takes minidump, then show MessageBox, and exit app.
2016-02-12 03:32:42 +01:00
Jace
47053285c8
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
Jace
b9ea314232
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-12 02:11:11 +01:00
6442254575
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# src/Game/Game.cpp
2016-02-12 02:09:14 +01:00
Jace
9f8b0f7aa9
Merge pull request #104 from teamfisk/AmmoPickup
...
Added AmmoPickupSystem with Component, Entity.
2016-02-12 02:08:29 +01:00
Jace
88c7c57671
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-12 01:46:45 +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
40ae2b8cbb
DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem.
2016-02-12 00:52:58 +01:00
11af6a3078
Merge branch 'master' into Respawning
...
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/MovementTest.xml
# src/Game/Systems/SoundSystem.cpp
2016-02-12 00:29:51 +01:00
0370775820
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-02-12 00:28:24 +01:00
a36ed76a4e
AmmunitionHUDSystem now really working
2016-02-12 00:26:59 +01:00
af30e51564
Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.
2016-02-11 23:56:40 +01:00
648d864d6e
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 23:48:30 +01:00
Jace
b761439c84
Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed.
2016-02-11 23:45:30 +01:00
Jace
44a73ef883
fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-11 23:44:20 +01:00
c1860ae383
AmmunitionHUD now working
2016-02-11 23:38:25 +01:00
Jace
7cae84d4ee
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# include/Engine/Core/EPlayerDamage.h
# src/Game/Game.cpp
# src/Game/Systems/Weapon/WeaponSystem.cpp
2016-02-11 22:52:51 +01:00
Jace
d1213f9f59
Working damage dealing, a super cool reload effect and hit markers!
2016-02-11 22:50:44 +01:00
70f4002d70
Merge remote-tracking branch 'origin/Animations' into TCPConnections
2016-02-11 22:15:59 +01:00
055f6517a1
Merge remote-tracking branch 'origin/master' into TCPConnections
2016-02-11 21:24:16 +01:00
afd9e24df6
Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...
2016-02-11 21:23:53 +01:00
5bcadd5b1a
Merge pull request #95 from teamfisk/CapturePointTake
...
Fixed CapturePointTimer,Color
2016-02-11 21:10:30 +01:00
42d810b198
Merge pull request #84 from teamfisk/DamageIndicator
...
Damage indicator
2016-02-11 21:08:59 +01:00
8f500965d4
Changed DamageIndicator.xml to not use a glowmap and not a depthsort.
2016-02-11 20:34:25 +01:00
Jace
5e05e51309
Fixed EntityFirstHitByRay not returning outDistance properly
2016-02-11 20:01:23 +01:00
Jace
e2a8605101
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-11 17:25:37 +01:00
Jace
c8c4879554
Merge pull request #93 from teamfisk/OctreeRaycasting
...
Entity in octree hit by ray
2016-02-11 17:25:02 +01:00
Jace
e47201ff61
First person shoot animations
2016-02-11 17:06:34 +01:00
3301f66ad1
Merge remote-tracking branch 'origin/master' into DamageIndicator
...
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
2016-02-11 16:36:48 +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
97b915f130
Merge branch 'master' into Respawning
...
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
2016-02-11 16:15:47 +01:00
stiffly
verysecrethero
Jocke
Jace
viktorljung
Tleety
William Moberg