Commit Graph

31 Commits

Author SHA1 Message Date
metalgearsloth
1bab97a534 Remove lobby preload (#15670) 2023-04-23 13:14:25 +10:00
metalgearsloth
10d82afcc9 Fix lobby votes (#15342) 2023-04-12 17:39:43 +10:00
metalgearsloth
4cb3e464ac Fix lobby votes (#15041) 2023-04-02 01:00:48 +11:00
metalgearsloth
f3a06a0696 Add arrivals (#14755)
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
2023-03-22 04:29:55 -05:00
Kevin Zheng
72e1a5e109 Fix in-game voting (#12932)
* Fix in-game voting

* Add comment

* Re-enable vote.restart_enabled by default
2022-12-19 02:13:37 +01:00
theashtronaut
794e3504f2 Make lobby ready button clear what state you are in (#12152) 2022-11-04 11:51:25 +11:00
Mervill
281b790067 Make the Lobby Round Timer a bit clearer (#11977) 2022-10-22 14:52:34 -07:00
Flipp Syder
3f0773e1f4 Character setup in Lobby UI (#12007) 2022-10-18 08:45:32 +02:00
Flipp Syder
a3dafd88dc Oldchat (#11913)
* attempt at moving MainViewport to UIWidget

* oldchat (prototype)

* separate oldchat and default ss14 HUD into their own files

* restores original default game screen logic and adds that logic into separated chat game screen

* hand reloading, several tweaks to port oldchat to main ss14 branch

oldchat is currently not selectable

* screen type cvar, gameplay state screen reloading/loading

* reload screen on ui layout cvar change

* fixes up basic reloading (HUD switching is still very bad)

* some UI widget reloading for main UI screen switching

* alert sync on screen change

* inventory reload

* hotbar margin fix

* chat bubbles above viewport

* whoops

* fixes ordering of speech bubble root

* should fix the chat focus issue (at least in-game, not lobby yet)

* should fix up the lobby/game chat focus

* fixes chat for lobby, turns lobby into a UI state

* viewport UI controller

* viewport ratio selection

* whoops

* adds the /tg/ widescreen ratio

* removes warning from inventory UI controller, adds background to separated chat game screen's chat portion

* menu button reload

* unload menu buttons only from gameplay state shutdown

* bugfix

* character button fix

* adds config options for viewport width/UI layout

* variable naming changes, get or null instead of get to avoid exceptions

* moves entity system get into controller
2022-10-17 17:13:41 -05:00
metalgearsloth
5373fec641 Fix a bunch of warnings (#11965)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 08:44:23 -07:00
Jezithyr
571dd4e6d5 Hud refactor (#7202)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
wrexbe
018a96ee88 Merge more UI refactor stuff (#11277)
* Changelog+options ui controller
* Sandbox UI controller
* Escape menu UI controller
2022-09-14 14:34:48 -07:00
wrexbe
35b90736b7 Minor UI refactor (#11212) 2022-09-11 20:42:12 -07:00
wrexbe
88465961e0 Make content work with UI engine changes (#10990) 2022-09-04 16:17:05 -07:00
wrexbe
c4d135e253 Refactor lobby status (#10550) 2022-08-14 12:54:49 -07:00
Jessica M
b97f0f033e Fixes lobby station timer (#10261) 2022-08-02 18:30:10 -07:00
Jessica M
ae4ca09a57 Add current station time to game lobby (#9665)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-07-30 19:55:43 -07:00
Leon Friedrich
962a2f269f Fix inaccessible ready button in lobby (#8465)
* Fix inaccesible ready button in lobby

* a

* vote popups

* splitz
2022-05-26 19:33:12 -07:00
Veritius
3b7e202044 Flavor text (#8070) 2022-05-13 15:58:45 -07:00
Jesse Rougeau
8418098dd8 Lobby Refactor (#7077) 2022-03-13 19:33:19 -07:00
mirrorcult
ec4d4688c7 Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Vera Aguilera Puerto
f4d8ec1b35 Refactor Game Modes (#5857) 2021-12-21 21:23:29 +01:00
Moony
c1e0e7e058 Unfuck the lobby countdown timer (#5519) 2021-11-25 20:30:36 +01:00
Pieter-Jan Briers
d52965cbd1 Fix disconnecting inside lobby.
Fixes #4862
2021-10-13 20:43:40 +02:00
moonheart08
a2b04482a4 Add a warning dialog to the observe button. (#4794) 2021-10-08 16:22:57 +02:00
metalgearsloth
03d1df8190 Fix lobby exception (#4544)
From what I could tell whenever LobbyState is entered it makes a new Lobby + CharacterSetup GUI via Startup. These events are never disposed of under Shutdown + the lobby should be null whenever we're not in LobbyState (as the control ends up disposed).

The lobby == null checks could probably also be null asserts as they shouldn't be null when those methods are being called.
2021-09-01 16:39:19 -07:00
Pieter-Jan Briers
b96d760043 Chat improvements. (#4283)
* UI is an abbreviation, in XAML.

* Chat improvements.

Changing the "selected" channel on the chat box is now only done via the tab cycle or clicking the button.

Prefix chars like [ will temporarily replace the active chat channel. This is based 100% on message box contents so there's no input eating garbage or anything.

Pressing specific channel focusing keys inserts the correct prefix character, potentially replacing an existing one. Existing chat contents are left in place just fine and selected so you can easily delete them (but are not forced to).

Channel focusing keys now match the QWERTY key codes.

Deadchat works now.

Console can no longer be selected as a chat channel, but you can still use it with the / prefix.

Refactored the connection between chat manager and chat box so that it's event based, reducing tons of spaghetti everywhere.

Main chat box control uses XAML now.

General cleanup.

Added focus hotkeys for deadchat/console. Also added prefix for deadchat.

Local chat is mapped to deadchat when a ghost.

Probably more stuff I can't think of right now.

* Add preferred channel system to chat box to automatically select local.

I can't actually test this works because the non-lobby chat box code is complete disastrous spaghetti and i need to refactor it.

* Move chatbox resizing and all that to a subclass.

Refine preferred channel & deadchat mapping code further.

* Don't do prefixes for channels you don't have access to.

* Change format on channel select popup.

* Clean up code with console handling somewhat.
2021-07-20 10:29:09 +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
Vera Aguilera Puerto
f7f996e168 Fix a single namespace 2021-06-20 10:14:52 +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
DrSmugleaf
ff1a2d97ea Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00