5,412 Commits over 1,553 Days - 0.15cph!
Add a comment to fire off a build as phrases ended up not needing to be rebuild after the merge
merge from masterkey -> main
merge from playermaintainedmonuments -> masterkey
Code to ensure player is looking at the lock while opening it
- starting with being extra strict but I think I'll be more lenient later
Add icons for up and down
Add keylock position to door prefabs
Move apartment door menu options to new file
Unsaved changes to animator
Add master key to icon generator manifest
Update master key icon
Animation code hooked up for master key
- uses a custom AnimationSubSystem before we figure out how to simplify it to the OverrideAnimationSubSystem
Fixes after converting ItemManager.Items static -> instance
Switch ItemManager.Items from a static class to a instance
- fixes it not being reset by ResetStaticFields (and this being the easier way to do so)
- add master key item too
merge from main -> masterkey
merge from editor_cfg_parallel_import -> main
Set standby import worker count to 0 and set shutdown delay to 10s
- prevents out of process import processes from sticking around and eating RAM
merge from waterwell_stock_decrease -> main
Create tests to confirm waterwell stock is correct
Cleanup method that returns max stock
Fix the maxStock for NPC vending orders being confusing
- it used to only change the initial stock and then refill to the maximum of the vendor
- now it just sets a different max stock for that individual vending order
Add "spawnvendor" command to spawn vendors in the editor (they are two different prefabs glued together)
merge from main -> waterwell_stock_decrease
Switch Newtonsoft test to use Unity's test framework
Rewrite Newtonsoft JSON converts to not use JSON.LINQ (which is what they did in Newtonsoft 8.0.0)
- tests pass
merge from fix_second_hotbar -> main
Fix not being able to drag icons into the bottom row of the main inventory (second hotbar) due to the main inventory being rendered on top of the hotbar
Fix swaphotbar only working if ran from a bind, switch it to only running if the second hotbar is enabled / rendered
Fix keybinds showing under the second hotbar
merge from fix_highwall_decay_delay -> main
Fix high walls having a 5hr delay decay: should start decaying right away now that it uses upkeep
merge from editor_hotbar_swap -> main
Cleanup redundant UIBeltSecondRowPreview.cs
Fix hideInvalidIcons not set in the second hotbar so it wasn't going away when convar was disabled
Shift up the second hotbar so it matches inventory placement
merge from main -> editor_hotbar_swap
merge from fix_instantiate_persistant_setactive -> main
Fix editor printing errors in ItemIcon.OnEnable() and QuickCraft.OnEnable()
- caused by an editor optimization to not create copies of single use prefabs (GameUI)
- however GameUI is cursed and called SetActive() from inside Awake() which caused OnDisabled() to not be called, causing some of the UI prefabs to get into weird states
- kept the optimization but locked it behind an editor pref for now until it can be properly fixed
Fix the second hotbar prefab not referencing the main inventory
Add the second hotbar to GameUI.Hud.prefab (so much for the dream of not reserializing the large UI prefabs)
Make the second hotbar a prefab instead of cloning the normal hotbar
Update the GameUI.Inventory.prefab prefab manually with only the fields we want to change (instead of the whole prefab reserializing)
Modify ContainerSourceLocalPlayer so it can override the transform it uses for `ItemIcon[] allIcons`
- the main inventory panel was parented too high and grabbing icons from different panels
- keep the parenting the same, only changing where it's fetching the icons from
merge from main -> editor_hotbar_swap
Don't render the last row of the last row of the main inventory when the 2nd hotbar is shown so it looks better when openinga and closing main inventory
Make the editor-only feature available for admins too
- NOT FOR NORMAL PLAYERS
- press Z (can rebind) to swap to a second hotbar
- enable "drawsecondhotbar" to render the second hotbar above the first
