Merge from main

Closed up holes at the back near the sides on the armoured cockpit

balance, hp heart hover shop min money change more sfx

Fixed Patrol Heli tracer visibility.

Prevent login exception Remove unused from PackageWrapMinimal

Update manifest, fixes revolver not loading

Fixed small holes in armoured cockpit colliders at the front

Depth Resolve writes to both channels correctly Final cleanups for dof2

update depth of field scene

LOD tweaks FX iteration

Final tweaks, add depth gap for adding an area where u might want more focus https://files.facepunch.com/sam/1b0211b1/sbox-dev_VBIoPeaBWP.mp4

world_update_2 -> Aux2

world_update_2/waterwell_update -> world_update_2

Added static respawning planters to new Water Wells.

Fix SpriteComponent.UsePixelScale when AspectRatio != 1

Updated the mesh sampling system on the spraycan free spray to find and use a valid wallpaper renderer, fixes free hand sprays appearing below wallpapers

Respawning Static Planters ~ Added ConVar to adjust the extra favourable gene chance. Better system for informing the static planter when plants die Set respawn check to 30 seconds

Added SpriteComponent.UsePixelScale. When enabled, a 32x32 Sprite will have the dimensions of 32x32 instead of the default 100x100.

Front blur, tweaks

Parent merge

Merge from main

Missed FBX

Tiny material fix to two jungle ruin pieces. Added ziggurat blockout to get that task started.

Stash all this work so I can make ubre happy Stash this as well first Custom (INetworkCustom such as NetList/NetDictionary) not including in delta snapshot for now as they handle this sort of thing themselves. Stepping stone ++ Logs No wonder this wasn't getting received Don't log these now Test Remove this now Go on server time Test More tests Some cleaning Compress test Remove for comparison Pack them up Some cleanup Force a single delta snapshot when owner changes to simulate old behavior Interp test Revert that

Optimize TextureBuilder creations with no initial data * Use vkCmdClearColorImage instead of allocating a big empty buffer in managed * Texture.CreateInternal also passes a nullptr if the span is empty, so we don't do additional unnecessary setdata It's weird all of this stuff has an API of Span<T> & int length, but hard to fix without API breaking changes DrawIndirectArguments should be LayoutKind.Sequential

WIP more control for rerouting connections

Fuzzed the backend/origin of the side blast flipbook.

Fixed HCR attack prefab reference. Iterated on attack.

Fixed wanted poster assign UI NRE

Smoke grenade world model and LODs

Ensured soil saturation stays at maximum throughout growth cycle Overall quality artificially set

frontier wall updates

Remove old dead AI code, hook up some events in preparation for NPCs being able to react to bullets impact near them or flying past them

Fixed DropEntityIfHeld affecting all players holding anything Implements `CHL2_Player::ForceDropOfCarriedPhysObjects`'s argument to actually work Also now affects Physics Gun, for consistency with other such functions. it is now an alias of `Entity:ForcePlayerDrop()`, and is deprecated in favor of it. Fixed Close Caption HUD being disabled by sethudvisibility input Update .gitignore Fix MatSelect erroring on select if not given a convar Added MatSelect.OnSelect and OnRightClick Improvements to PropSelect to match MatSelect Implement Panel:Clear Added OnSelect hook Added OnRightClick hook Fixed errors when not given a convar Added FindModelByValue Added SelectModel

Added system to mark growable entities as god - this ensure they always calulate max quality on all stats Applied to plants inside static planter

Mainmenu improvements (#1655) * Add GameModal that pops up when you click a Game instead of instantly launching it (Currently Empty) * Moved Vote Up, Vote Down, and Favourite buttons into PackageRatingButtons so it can be re-used * Finished initial version of Game Modal with options to launch into a game and see all active lobbies. * Remove scrolling on Game Modal, replace Lobby List with a button that opens the Lobby List modal layered above. * Close Game Modal when entering Lobby from Lobby List Modal * Give Lobby List Modal and other missed Modals the primary background * Fix time offset strings displaying incorrectly * Active Lobby buttons now open the Game Modal instead of loading you directly into the lobby * Remove Global Stats from Game Modal. Unnecessary information * Fix Maps menu opening the Walker Game Modal instead of launching directly into the map * Org Page is now replaced with an Org Modal that can be opened at any time. * Moved SettingsPage into a Settings Modal that pops up over everything * Added Settings Modal to the Pause Menu * Fix Package Modal not toggling when pressing F1 * Pad the bottom of GameGroups * Show Player Icons on Active Lobby Cards (shows lobby hosts) * Game Tiles are now all the same size instead of being randomly sized * Give Game List Columns a max-width * Lobby Heads on LobbyCards no longer block mouse inputs and are a bit larger. * Clicking the name of a game opens the Game Modal instead of the Generic Package Modal * GameTiles are now treated as one big button, clicking anywhere will open Game Modal. * Removed box around header on Game and Org Modals * Options on Game Modal are now "Create Game" and "Join Game" if multiplayer, with the Lobby List being moved elsewhere. Join Game is disabled if there are no active lobbies * Added `flex-shrink: 0` to entries of the ServerListModal * Added icons to Game Modal info, removed information that wasn't important and overall cleaned up readability. Also added Total Players and Playtime * MenuOverlay now uses Screen.DesktopScale (with 1080p minimum) * Added missing ToolTips to GameTile * Fixed outstanding issues where a page wouldnt load until you moved your mouse over it. * Adjusted font size on Game Modal * Enable Looping on Main Menu music and Loading music * Game Tile and Lobby Cards play sounds on click instead of `:active`, prevents clicking sound playing while dragging * Fixed LoadingOverlay not including Subtitle in BuildHash * Remove warning from LobbyCard since it doesn't need the async stuff anymore * Remove unused variables from Game and Org Modals * Remove refreshing variable from GameModal * Fix Home Page Categories. Uses ListResult instead of hardcoded categories from initial concept * LobbyCard UsersNow displays the total number of users across all lobbies instead of the number of lobbies * Fix max-width on HomePage columns * Add NRE check for when Package.Screenshots is null * Don't request partial package for GameModal * Added a way to select previous Jams on the Game Jam Page. Currently hardcoded with gamejam1 and gamejam2. * GameTiles all now enforce the same aspect-ratio (16:9) * Fix GameModal not loading its contents instantly. * Added Tooltips to LobbyCards * Fix Lists in 4:3 Screen Ratios * Settings Button no longer brings you back to the Home Page * Fix padding on PageHeader * Revert GameModal back to string ident and use Package.TryGetCached instead. * Order ServerListModal by Player Count * Fixed HeaderTab styling on Settings Modal * Fixed lobby heads being off by 1 pixel * Make all elements on the Social Bar match instead of looking completely different * Update the Map Select Modal to match where it doesn't already * PackageSelectionModal also follows same styles. * Add proper Volume Slider to VideoControls * Change default starting volume for VideoControls * Play button is greyed out and says VR Only if the game is only compatible with VR and the user is not currently loaded in VR. * Unify multiplayer check in Game Modal and MenuHelpers * Fix package reference in GameModal * Show package using cached version * Add Application.IsVr * Add Sessions to PackageUsage * Add TimeSpan.Humanize * Add MenuUtility.CloseAllModals * Break game modal up to managable components https://files.facepunch.com/garry/3419ba7b-7e50-4b5c-a727-3e315fb4dffe.png * Fix broken style * Lobby list cleanup, list view aspect * Fix ToolTips in GameModal * Engagement tooltips display on entire entry not just icon. * Games with LaunchMode "QuickPlay" will only display the one play button (since both would do the exact same thing) * Fixed Videos now having their icon styling on GameModal Media * Fix clicking on GameTiles still opening the Org Modal when on `/games` page * Add `GameModal.HasFullPackage`. Show skeletons until full package is loaded. * Broke GameModal down into a BasePackageModal that GameModal inherits. Added MapModal which inherits the same thing. * Fix Base PackageFilters not preserving tags * MapModal ActionBar has option to select game before launching map. Add Map Modal everywhere necessary. * MapModal ActionBar queries lobbies properly, getting lobbies across all games * Unify Game Close functions. Fixes Review Modal not appearing and mouse status not resetting all of the time * Lets order everything by upvotes by default, for now * Fix some GameTiles being massive when at the end of the list * Make the "no screenshots" view a bit nicer --------- Co-authored-by: Carson Kompon <carsokompo@gmail.com>

Make the "no screenshots" view a bit nicer

Fix some GameTiles being massive when at the end of the list

Dont try to Free a list that doesn't exist

Added an optimised way to check if a static planter box is empty

merge from digitalclock (new sounds)

Add GameModal that pops up when you click a Game instead of instantly launching it (Currently Empty) Moved Vote Up, Vote Down, and Favourite buttons into PackageRatingButtons so it can be re-used Finished initial version of Game Modal with options to launch into a game and see all active lobbies. Remove scrolling on Game Modal, replace Lobby List with a button that opens the Lobby List modal layered above. Close Game Modal when entering Lobby from Lobby List Modal Give Lobby List Modal and other missed Modals the primary background Fix time offset strings displaying incorrectly Active Lobby buttons now open the Game Modal instead of loading you directly into the lobby Remove Global Stats from Game Modal. Unnecessary information Fix Maps menu opening the Walker Game Modal instead of launching directly into the map Org Page is now replaced with an Org Modal that can be opened at any time. Moved SettingsPage into a Settings Modal that pops up over everything Added Settings Modal to the Pause Menu Fix Package Modal not toggling when pressing F1 Pad the bottom of GameGroups Show Player Icons on Active Lobby Cards (shows lobby hosts) Game Tiles are now all the same size instead of being randomly sized Give Game List Columns a max-width Lobby Heads on LobbyCards no longer block mouse inputs and are a bit larger. Clicking the name of a game opens the Game Modal instead of the Generic Package Modal GameTiles are now treated as one big button, clicking anywhere will open Game Modal. Removed box around header on Game and Org Modals Options on Game Modal are now "Create Game" and "Join Game" if multiplayer, with the Lobby List being moved elsewhere. Join Game is disabled if there are no active lobbies Added `flex-shrink: 0` to entries of the ServerListModal Added icons to Game Modal info, removed information that wasn't important and overall cleaned up readability. Also added Total Players and Playtime MenuOverlay now uses Screen.DesktopScale (with 1080p minimum) Added missing ToolTips to GameTile Fixed outstanding issues where a page wouldnt load until you moved your mouse over it. Adjusted font size on Game Modal Enable Looping on Main Menu music and Loading music Game Tile and Lobby Cards play sounds on click instead of `:active`, prevents clicking sound playing while dragging Fixed LoadingOverlay not including Subtitle in BuildHash Remove warning from LobbyCard since it doesn't need the async stuff anymore Remove unused variables from Game and Org Modals Remove refreshing variable from GameModal Fix Home Page Categories. Uses ListResult instead of hardcoded categories from initial concept LobbyCard UsersNow displays the total number of users across all lobbies instead of the number of lobbies Fix max-width on HomePage columns Add NRE check for when Package.Screenshots is null Don't request partial package for GameModal Added a way to select previous Jams on the Game Jam Page. Currently hardcoded with gamejam1 and gamejam2. GameTiles all now enforce the same aspect-ratio (16:9) Fix GameModal not loading its contents instantly. Added Tooltips to LobbyCards Fix Lists in 4:3 Screen Ratios Settings Button no longer brings you back to the Home Page Fix padding on PageHeader Revert GameModal back to string ident and use Package.TryGetCached instead. Order ServerListModal by Player Count Fixed HeaderTab styling on Settings Modal Fixed lobby heads being off by 1 pixel Make all elements on the Social Bar match instead of looking completely different Update the Map Select Modal to match where it doesn't already PackageSelectionModal also follows same styles. Add proper Volume Slider to VideoControls Change default starting volume for VideoControls Play button is greyed out and says VR Only if the game is only compatible with VR and the user is not currently loaded in VR. Unify multiplayer check in Game Modal and MenuHelpers Fix package reference in GameModal Merge branch 'master' into mainmenu-improvements Show package using cached version Add Application.IsVr Add Sessions to PackageUsage Add TimeSpan.Humanize Add MenuUtility.CloseAllModals Break game modal up to managable components https://files.facepunch.com/garry/3419ba7b-7e50-4b5c-a727-3e315fb4dffe.png Fix broken style Lobby list cleanup, list view aspect Fix ToolTips in GameModal Engagement tooltips display on entire entry not just icon. Games with LaunchMode "QuickPlay" will only display the one play button (since both would do the exact same thing) Fixed Videos now having their icon styling on GameModal Media Fix clicking on GameTiles still opening the Org Modal when on `/games` page Add `GameModal.HasFullPackage`. Show skeletons until full package is loaded. Broke GameModal down into a BasePackageModal that GameModal inherits. Added MapModal which inherits the same thing. Fix Base PackageFilters not preserving tags MapModal ActionBar has option to select game before launching map. Add Map Modal everywhere necessary. MapModal ActionBar queries lobbies properly, getting lobbies across all games Unify Game Close functions. Fixes Review Modal not appearing and mouse status not resetting all of the time Lets order everything by upvotes by default, for now

Lets order everything by upvotes by default, for now

Fix divs not updating when text content is cleared, Facepunch/sbox-issues#6192

merge from frontier_hazmzat_cloth_fixes

Statically spawned planter boxes will now generate genes with a weight towards the positive, rather than completely random

Buildfix: invalid macro scope Tests: built in none mode - passed

adjusted frontier_hazmats BC MaxOriginDeltas to roughly enclose character - massively helps cloth resolve when mounting and stops odd behaviour at high noclip speeds

BurstCloth Stability - made max origin delta configurable (default value is the same as the old hardcoded one) - origin and simspace deltas accumulated and cleared when sim job is scheduled, this was the main cause of most small explosions in cloth behaviour