Merged
Conversation
* Project Menlo Port Ports the stuff we want from Frontier's Project Menlo, without the stuff we don't! * Battery (SMES/substation) interface (#36386) * Add ENERGYWATTHOURS() loc function Takes in joules (energy), displays as watt-hours. * Add simple OnOffButton control * Re-add Inset style class This was sloppily removed at some point?? Whatever, I need it. * Add helper functions for setting title/guidebook IDs on FancyWindow Reagent dispenser uses these, more in the next commits. * Add BuiPredictionState helper This enables me to implement coarse prediction manually in the battery UI. Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server. * Add input coalescing infrastructure I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value. There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up. I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic. In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for. Adding new coalescing logic should be possible in the future, of course. It's all just small helpers. * Battery interface This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great. This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW. * Oops, forgot to remove these style class defs. # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/BuiPreTickUpdateSystem.cs # Content.Client/UserInterface/BuiPredictionState.cs # Content.Client/UserInterface/Controls/FancyWindow.xaml.cs # Content.Client/UserInterface/InputCoalescer.cs # Content.Shared/Localizations/ContentLocalizationManager.cs * Update StyleNano.cs --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
* quad speed change * added modifier to all spawnable instances * made all speed increase the same as med doc
github-actions
bot
added
S: Untriaged
size/L
YML
UI
C#
Sprites
FTL
Audio
and removed
S: Untriaged
size/L
labels
|
RSI Diff Bot; head commit 9e92a5a merging into e80a36c Resources/Textures/_NF/Objects/Power/big_ame_jar.rsi
Resources/Textures/_NF/Structures/Machines/AMEFab/32x32.rsi
Resources/Textures/_NF/Structures/Machines/AMEFab/64x32.rsi
Resources/Textures/_NF/Structures/Machines/AMEFab/base.rsi
Resources/Textures/_NF/Structures/Machines/GasConverter/32x32.rsi
Resources/Textures/_NF/Structures/Machines/GasConverter/base.rsi
Resources/Textures/_NF/Structures/Power/TransmissionPoint/32x32.rsi
Resources/Textures/_NF/Structures/Power/TransmissionPoint/96x32.rsi
Resources/Textures/_NF/Structures/Power/TransmissionPoint/base.rsi
Resources/Textures/_NF/Structures/Power/bles.rsi
|
fixing linter fails
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
ported 2 more PRs from hardlight