DEATHB4DEFEAT
47b10a01b0
Catch-Up Cherry Pick 2 ( #944 )
...
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540 .
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com >
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com >
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com >
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com >
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com >
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com >
Co-authored-by: ShadowCommander <shadowjjt@gmail.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Jezithyr <jezithyr@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Ciac32 <aknoxlor@gmail.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com >
Co-authored-by: Vasilis <vasilis@pikachu.systems >
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com >
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com >
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com >
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com >
Co-authored-by: exincore <me@exin.xyz >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com >
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com >
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com >
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com >
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com >
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com >
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com >
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com >
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com >
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: ike709 <ike709@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com >
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com >
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
2024-10-19 14:53:37 +07:00
Pieter-Jan Briers
ccea85136b
Random spontaneous cleanup PR ( #25131 )
...
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me >
---------
Co-authored-by: 0x6273 <0x40@keemail.me >
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
2024-02-18 23:02:29 +01:00
metalgearsloth
98cf505f9f
Remove SharedEye (but content) ( #19481 )
2023-09-27 21:59:12 +02:00
metalgearsloth
4cfc578011
Revert "Remove most usages of obsolete TransformComponent methods (#1… ( #19714 )
2023-09-01 12:30:29 +10:00
Visne
1416942bea
Remove most usages of obsolete TransformComponent methods ( #19571 )
2023-08-30 12:05:19 +10:00
Moony
eee96125df
Revert "Moony z level hack ( #15031 )" ( #15032 )
...
This reverts commit 1f6663912b
2023-03-31 21:50:11 -05:00
Moony
1f6663912b
Moony z level hack ( #15031 )
...
* save work
* Adds Z levels
* a
* ladders + parallax scroll
* zoom out not in
* oops, sandbox
* oops i broke the law
* run ci
* fuck
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com >
2023-03-31 21:49:10 -05:00
Flipp Syder
3eb8f70985
Screen load event for GameplayState ( #14316 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-03-11 14:25:56 +11: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
