Arthur Asimov
f8d4eea0dc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Maps/core.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
Simon
14b8762bf3
Add round ID to status HTTP API ( #21904 )
...
* added round_id
* Update Content.Server/GameTicking/GameTicker.StatusShell.cs
Co-authored-by: 0x6273 <0x40@keemail.me>
---------
Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: 0x6273 <0x40@keemail.me>
2023-11-26 13:54:43 -06:00
Morb0
611bfea5ff
Merge remote-tracking branch 'upstream/master' into update-sposnors
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Packaging/ContentPackaging.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Resources/Audio/Weapons/Guns/Gunshots/license.txt
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
Morb
525d8e3e94
Add map info to status HTTP API ( #21089 )
2023-11-05 21:03:36 -07:00
Morb0
833ee6b706
Hotfix join queue resolve in status shell
2023-10-03 15:50:05 +03:00
Morb
195c402ef1
[Major] Moving out Queue, Verifications and Sponsors ( #1435 )
2023-10-01 14:59:40 +03:00
Morb
fb3f24652e
Revert "Revert "Server join queue ( #583 )"" ( #602 )
2022-11-29 06:41:12 -08:00
Morb
97973e2ed9
Revert "Server join queue ( #583 )"
...
This reverts commit 84605eacb8
2022-11-27 04:09:27 -08:00
Morb
84605eacb8
Server join queue ( #583 )
2022-11-25 23:38:46 -08:00
Aerocrux
7750675757
Add SoftMaxPlayers to status response for launcher use ( #9365 )
2022-07-08 21:44:49 +02:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Pieter-Jan Briers
2125f1dda9
Remove usages of Newtonsoft.Json from StatusHost ( #6082 )
2022-01-10 01:41:46 +01:00
Vera Aguilera Puerto
5b41d3328e
Fix crash when getting server status
...
- Adds _roundStartDateTime field to GameTicker, the UTC time when the round started.
2021-06-20 17:38:05 +02:00
Vera Aguilera Puerto
d3a611164b
Turns GameTicker into an EntitySystem. ( #4197 )
...
* GameTicker turned into an EntitySystem
* Turns ClientGameTicker into an EntitySystem, turn NetMessages into events
* Change event names to be more consistent with the rest.
* YAML linter uses the dummy gameticker CVar override.
* Fix game ticker initialization order
* Dummy ticker won't spawn players.
* Fix character creation test
2021-06-20 10:09:24 +02:00
