Commit graph

32 commits

Author SHA1 Message Date
Vigers Ray
e9597f645f убрал упоминание форума 2025-07-17 23:48:51 +03:00
Vigers Ray
fffada0d68 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
#	Content.Server/Cargo/Components/StationBankAccountComponent.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	Resources/Locale/en-US/_strings/cargo/cargo-accounts.ftl
2025-04-13 17:18:35 +03:00
Ed
5f78b72763
ParallaxControl UI Dehardcode (#36071)
* Parallax Control Improve

* Update MainMenuControl.xaml

* PJBControl.cs
2025-04-13 22:44:44 +10:00
Vigers Ray
78aa7aefe4 Уменьшил время на переподключение до 15с 2024-11-26 20:46:48 +03:00
haiwwkes
5c3211b9ec
aaaaaaa (#616) 2024-11-13 04:10:39 +03:00
haiwwkes
8987a12177
ban links. (#548) 2024-10-30 10:44:32 +03:00
VigersRay
0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Launcher/LauncherConnecting.cs
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Launcher/LauncherConnectingGui.xaml.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Medical/Components/HealthAnalyzerComponent.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Content.Server/StationEvents/Events/RandomSentienceRule.cs
#	Content.Shared/Interaction/Components/BlockMovementComponent.cs
#	Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Objectives/objectiveGroups.yml
#	Resources/Prototypes/Objectives/stealTargetGroups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/migration.yml
2024-08-22 06:50:04 +03:00
Repo
93497e484f
Copy button for ban/disconnect reason (#30760)
* Copy button for connection messages on failed connections and ban hit attempts

* loc

* better sepperation layout

* consistent styling.

* Fix loc var name

* Reconnect button back.

* Move clipboard dependency out to the params.

* open buttons so they look a bit better.
2024-08-20 23:31:09 +02:00
VigersRay
dcfa1e82e7 фикс хаба серверов 2024-08-15 05:07:17 +03:00
Rinary
05aeb44b14
[RU] Полный перевод (#236)
* init

* fax translate

* translate

* translate cargo panel

* road map translate

* Fix cargo panel | fix bot craft translate

* fix, steal objectives translate

* do not break my not localized fax!

* fix

* radio guide translate

* Better DefaultRules

* Translate Criminal Records

* Space luw fully translate excluding CrimeList(need to rework)

* Some Guidebook translate

* Перевод глоссария, некоторые термины были переписанны под РУ комьюнити игры, некоторые к сожелению остались прежними

* Fix

* fix, translate

* Обновил структуру SpeakOnUIClosed, пофиксил перевод автоматов

* update and fix

* fully translate

* fix

* not fail but warn

* fix

* fix2

* фикс уже переведённого дерьма от корвахов

* Добавил термин подов в глоссарий

* roles translate fix

* Сикей в глоссарий

* Delete Resources/Locale/ru-RU/_sunrise/info/character-info.ftl

* remove cluster from pool

* new translation

* fully translate borgs

* some fixes

* Mr.Chang moment

* upd

* upd

* upd

* hotfix

* big fix

* fix some hardcode lang

* oh no shitcode language

* some translation

* some actions| admin commands translate start

* some new translation

* fully translate commands | figurines | chat-repo

* upd

* second upd

* upd

* start translating items

* some fixes

* translate wackpack

Из-за игры слов, я не смог нормально интерпритировать это дерьмо, так что пусть будет так, да теряется смысл и смешинка, но извините, я не смог как-то придумать игру слов

* translate

* debug translate

* upd

* Актуализация всего перевода

* fix

* fix

* upd

* some fixes | guns to his folders

* upd

* upd

* upd

* upd

* upd

* upd

* Перевод меток атмоса

* Последние коррективы

* fix

* some hardcode localization fix

* fix

* some fixes

* stats entry fully translate

* upd

* some fixes

* translate server side stats entry

* fix

* fix

* fix2

* fix

* upd

* upd

* fix

* holly shit

* fix

* totaly feed

* upd

* upd

* fix

* upd

* init

* upd

* upd

* access in prototypes

* Sunrise comments on code

* my bad

* я даун
2024-08-14 21:44:32 +03:00
VigersRay
a9152c0a53 Revert "3 попытки конекта в случае дисконекта"
This reverts commit f0900740f1.
2024-08-10 17:10:50 +03:00
VigersRay
f0900740f1 3 попытки конекта в случае дисконекта 2024-08-07 22:42:33 +03:00
VigersRay
cdf4e8dae0 Редизайн лобби 3 2024-07-05 20:02:44 +03:00
VigersRay
3da51ff368 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-01 19:44:09 +03:00
jmcb
ca87fb8bc5
Fix showing tips on the login screen from the localized tip dataset (#29640)
Regression introduced in #28285
2024-07-01 12:27:49 -04:00
VigersRay
d712594c90 фикс пустого хаба при подключении 2024-06-05 00:00:31 +03:00
VigersRay
144ee3c489 Servers Hub Fixes 2024-06-04 10:54:08 +03:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13)
* Хаб серверов внутри игры

* чейнжлог
2024-06-04 10:03:48 +03:00
Pieter-Jan Briers
0ecc5e8c96
Throttle people trying to connect to a full server. (#20972)
* Throttle people trying to connect to a full server.

To reduce spam/load on the server and connection logs table.

Players are forced to wait 30 seconds after getting denied for "server full", before they can try connecting again.

This code is an absolute nightmare mess. I tried to re-use the existing code for the redial timer but god everything here sucks so much.

Requires https://github.com/space-wizards/RobustToolbox/pull/4487

* Use new NetDisconnectMessage API instead.

* Add admin.bypass_max_players CVar.

Just something to help with debugging the player cap on dev, I don't expect this to ever be disabled on real servers.
2024-03-14 19:00:47 +11:00
Vigers Ray
5492cc5fd1
Login tips (#22234)
* Init coomit

* meh

* okay

* Revert "okay"

This reverts commit bb638aa4baa8dbd0e285c3435aabf83171a4806a.

* enable-d

* Update Content.Client/Launcher/LauncherConnectingGui.xaml.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* review

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-06 17:06:49 +11:00
metalgearsloth
749b062452
Don't clip ban reason text (#12925) 2022-12-07 20:05:18 -06:00
wrexbe
56c2ad6a16
Move/Rename stuff (#11209)
-     Change namespace, and folder of FancyWindow to Content.Client.UserInterface.Controls
-     Change xaml reference from ui to controls in some places
-     Change ClientAlertsSystem from internal to public
-     Change namespace, and folder of HighDivider to Content.Client.UserInterface.Controls
2022-09-11 18:56:21 -07:00
wrexbe
88465961e0
Make content work with UI engine changes (#10990) 2022-09-04 16:17:05 -07:00
wrexbe
31489abdd1
Format redial wait time (#8767) 2022-06-12 12:40:27 +10:00
20kdc
98c2b34512
Redial Button II - Now with magic! (#8237)
* Redial Button II - Now with magic!

* 15-second timer before redial is allowed
2022-05-21 18:56:18 -07:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Pieter-Jan Briers
661105dadd Make launcher connecting dialog show disconnect reason again 2021-10-04 01:45:39 +02:00
Pieter-Jan Briers
9cf37b6e68 Fix event handler leaks in LauncherConnecting 2021-08-30 01:50:54 +02:00
Visne
bf493c39b7
Replace most VBox/HBoxContainers with BoxContainers (#4274) 2021-07-18 18:39:31 +02:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances (#4155)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00
DrSmugleaf
f9acdbe5cc
Fix unused and improperly named xaml namespaces (#4172) 2021-06-10 23:09:07 +02:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00