Upstream sync #499
Merged
Upstream sync #499
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(seizures): remove seizures from the game * Reduced animation time to 2 seconds
* loc * per review * Update Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]>
…tart (also lobby music not looped anymore) (#25530) * fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) * refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished. * refactor: incapsulated info on current lobby track in simple record * refactor: fixed inconsistent naming between song and soundtrack for lobbymusic * refactor: xml-doc for LobbyPlaylistChangedEvent * fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed --------- Co-authored-by: pa.pecherskij <[email protected]>
* feat(inventory): Add secondary quick-remove star * style: Fix end of file newline * feat(inventory): Change secondary smart-equip star to silver star * feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary
cleanup chairs.yml not sure if i did this correctly
Librarian drip Co-authored-by: Plykiya <[email protected]>
Prediction for puddle and spillable examines
* Make itemslots more verbose with AME proof of concept. * Remove unnecessary [DataField] strings and use null coalescing in whitelist checks. * Change optional popup fields into LocId.
Co-authored-by: PJBot <[email protected]>
* patch QSI exception * fuck don't die
Revert "Make galoshes obtainable and slowing you (#25484)" This reverts commit 6568737.
* Add shuttle interior drawing back Just do it per-tile she'll be right, at least it's done with 1 draw call. * Revamp shuttle console * Bunch of cleanup work * Lables sortito * dok * Pixel alignment and colours * Fix a bunch of drawing bugs * Shuttle map drawing * Drawing fixes * Map parallax working finally * weh * Commit all my stuff * mic * deez * Update everything * Xamlify everything * uh * Rudimentary blocker range * My enemies have succeeded * Bunch of changes to FTL * Heaps of cleanup * Fix FTL bugs * FTL * weewoo * FTL fallback * wew * weh * Basic FTL working * FTL working * FTL destination fixes * a * Exclusion zones * Fix drawing / FTL * Beacons working * Coordinates drawing * Fix unknown map names * Dorks beginning * State + docking cleanup start * Basic dock drawing * Bunch of drawing fixes * Batching / color fixes * Cleanup and beacons support * weh * weh * Begin pings * First draft at map objects * Map fixup * Faster drawing * Fix perf + FTL * Cached drawing * Fix drawing * Best I got * strips * Back to lists but with caching * Final optimisation * Fix dock bounds * Docking work * stinker * kobolds * Btns * Docking vis working * Fix docking pre-vis * canasses * Helldivers 2 * a * Array life * Fix * Fix TODOs * liltenhead feature club * dorking * Merge artifacts * Last-minute touchup
remove doafter from toggling your own internals
* Fix FTLToDock - Removed Enabled coz unneeded really. - Fixed SetCoordinates call that got dumped at some point oop. * Fix this docking check
Co-authored-by: Plykiya <[email protected]>
Didn't account for UI scale properly I love transforms.
Also fixed some other stuff I noticed.
* content * catwalks * fix fucking icons * finish PR * +1 room * fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.