Ed
f59de85047
Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync
...
# Conflicts:
# Content.Client/Overlays/StencilOverlay.Weather.cs
# Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
# Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
2025-07-21 11:27:53 +03:00
DrSmugleaf
00826aaad6
Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out ( #37959 )
...
* Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out
* Missed one
* Missed another
* Fix data field ids
2025-07-10 05:06:51 +02:00
Pieter-Jan Briers
e99fc501a6
Revert biome rework ( #38724 )
...
* Revert "Fix world generation (#38713 )"
This reverts commit 10fa6ff4af#37735 )"
This reverts commit fe7b96147c
2025-07-03 20:48:04 +02:00
metalgearsloth
fe7b96147c
Biome rework ( #37735 )
...
* DungeonData rework
Back to fields, serializes better, just make new layers dumby.
* wawawewa
* Fix this
* Fixes
* Port the work over
* wawawewa
* zoom
* Kinda workin
* Adjust wawa
* Unloading work
* Ore + entitytable fixes
Iterate every dungeon not just last.
* Big shot
* wawawewa
* Fixes
* true
* Fixes
# Conflicts:
# Content.Server/Procedural/DungeonJob/DungeonJob.cs
* wawawewa
* Fixes
* Fix
* Lot of work
* wawawewa
* Fixing
* eh?
* a
* Fix a heap of stuff
* Better ignored check
* Reserve tile changes
* biome
* changes
* wawawewa
* Fixes & snow
* Shadow fixes
* wawawewa
* smol
* Add layer API
* More work
* wawawewa
* Preloads and running again
* wawawewa
* Modified
* Replacements and command
* Runtime support
* werk
* Fix expeds + dungeon alltiles
* reh
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2025-07-03 00:36:06 -04:00
Ed
d5fbdbdec0
Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
# Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
# Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
# Resources/Prototypes/Entities/Effects/chemistry_effects.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/GameRules/meteorswarms.yml
# Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
Tayrtahn
5a93099509
Update SharedBiomeSystem methods to use Entity<T> ( #37698 )
...
* Fix warning in TryGetBiomeTile
* Overload TryGetBiomeTile
* Overload more methods, fix internal warnings
* Update TryGetEntity uses
* Update TryGetTile uses
* Cleanup TryGetDecals use
* Formatting
* Two more warnings while we're here
2025-05-21 22:10:52 -04:00
Tayrtahn
80e7711966
Remove ParallaxVV property from ParallaxComponent ( #37617 )
...
Delete ParallaxVV
2025-05-19 17:36:30 -04:00
Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
...
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
Tayrtahn
86aa82f2b6
Cleanup: Remove redundant prototype name specifications ( #35793 )
...
* Remove redundant prototype name specifications
* These can stay
2025-03-19 19:30:31 +01:00
Ed
acc9886242
Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
...
# Conflicts:
# Content.Client/Options/UI/OptionsMenu.xaml
# Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Tayrtahn
6f925dd610
Fix prototypes so they pass analyzer checks ( #35435 )
2025-02-24 15:21:59 +11:00
Ed
07e0606ecf
Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
...
# Conflicts:
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
metalgearsloth
a457551108
Roof data rework ( #35388 )
2025-02-23 18:23:00 +11:00
Ed
7328f3449c
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Procedural/DungeonSystem.Rooms.cs
# Content.Server/Procedural/RoomFillComponent.cs
# Content.Server/Procedural/RoomFillSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/migration.yml
2025-02-16 11:58:47 +03:00
metalgearsloth
b6ee183dc6
Add planet lighting ( #32522 )
...
* Implements a Dynamic Lighting System on maps.
* Edit: the night should be a little bit brighter and blue now.
* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.
* Edit: The offset is now serverside, this makes the time accurate in all situations.
* Removing ununsed import
* Minor tweaks
* Tweak in time precision
* Minor tweak + Unused import removed
* Edit: apparently RealTime is better for what I'm looking for
* Fix: Now the time is calculated correctly.
* Minor tweaks
* Adds condition for when the light should be updated
* Add planet lighting
* she
* close-ish
* c
* bittersweat
* Fixes
* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"
This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.
* Europa and day-night
* weh
* rooves working
* Clean
* Remove Europa
* Fixes
* fix
* Update
* Fix caves
* Update for engine
* Add sun shadows (planet lighting v2)
For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.
* Documentation
* a
* Fixes
* Move blur to an overlay
* Slughands
* Fixes
* Remove v2 work
* Finalise
---------
Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com >
2025-02-16 19:35:32 +11:00
Ed
a1966d8671
improve BiomeDunGen ( #33113 )
...
* improve BiomeDunGen
* forgot lol
* Update DungeonJob.PostGenBiome.cs
* Update DungeonJob.PostGenBiome.cs
2024-11-11 23:19:54 -06:00
Ed
b803496694
Procedural + z-levels refactor ( #216 )
...
* create biome tile spawner
* spawner now spawn decals and entities
* fancy spawners
* remove old decals
* randomize seed
* fix bugs
* update alchemy test map to new system
* update z-level system
* autolink tweak
* add documentation
* Update GravityComponent.cs
* Update GravityComponent.cs
2024-06-05 19:59:39 +03:00
deltanedas
e37f95c24c
biome flexibility changes ( #28017 )
...
make biome apply template on mapinit, add api for setting Enabled
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-14 23:27:25 -04:00
metalgearsloth
c5486873db
Shuttle console + FTL rework ( #24430 )
...
* 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
2024-03-03 18:39:19 +11:00
Nemanja
2a6705818b
Make procgen use weighted variants ( #24669 )
2024-01-29 13:41:59 +11:00
metalgearsloth
bf79acd127
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
2024-01-04 14:25:32 +11:00
metalgearsloth
1fa5aaf92e
Fix biome marker layer command ( #21278 )
2023-11-18 18:08:20 +11:00
metalgearsloth
816ee2e1ab
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-14 19:23:40 -07:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
metalgearsloth
425e49bbc8
Fix salvage mission biome seed ( #20885 )
2023-10-10 14:35:50 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
48276eb00a
Optimise marker spawning ( #17922 )
2023-07-10 17:15:59 +10:00
metalgearsloth
9509757155
Add sub-biomes ( #17855 )
2023-07-09 15:26:16 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
metalgearsloth
ea4440be44
Make ore loot use walls as a mask ( #16377 )
2023-05-14 22:01:29 -04:00
metalgearsloth
210a70fc3a
Deload biome entities ( #15531 )
2023-05-08 01:03:04 +10:00
deltanedas
17fa2df632
parallax hotfix ( #15691 )
2023-04-23 20:28:40 +10:00
deltanedas
f72baa6a49
autogen parallax state ( #15384 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-22 22:02:23 +10:00
metalgearsloth
0301763043
Expedition mining spawn adjustments ( #15581 )
2023-04-20 23:32:06 +10:00
metalgearsloth
122350f19c
Salvage expeditions ( #12745 )
2023-04-20 10:43:13 +10:00
metalgearsloth
94ea61defa
Fix biome seed gen ( #15352 )
...
Well the command itself didn't set the seed properly so.
2023-04-12 09:38:14 -05:00
Kara
9688544e78
Content PR for auto-componentstate sourcegen ( #14845 )
...
* Content PR for auto-componentstate sourcegen
# Conflicts:
# Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
# Content.Shared/Content.Shared.csproj
# SpaceStation14.sln
* shared file too
* afterautohandlestate example
* oops
* anudda
* access fixed
* smart
2023-04-06 12:33:40 -05:00
metalgearsloth
6157dfa3c0
Salvage dungeons ( #14520 )
2023-03-10 16:41:22 +11:00
metalgearsloth
1f15a21323
Write loadedChunks for biomes ( #14255 )
2023-02-24 13:23:04 +11:00
metalgearsloth
a6ea8f5d3b
Use pvs range for biomes ( #14048 )
...
Forgot it wasn't on that branch
2023-02-12 05:37:02 +00:00
metalgearsloth
37f432ca58
Procgen biomes ( #13487 )
...
* Planetmap tiles
Biomes etc etc
* a
* oop
* Chunk-based rendering
* funny
* Less allocations
* Fix overdraw
* Content tile edge support
Also updated grass to use it as a POC.
* Kindly revert
* Update for variant edges
* fixes
* Use fastnoise
* Remove redundant group
* a
* refactor a fair bit
* Prototype data instead
* tweaks
* a
* fix maths
* working
* a
* Slightly better empty support
* a
* flowers
* sounds
* lewd
* Networking
* more fixes
* better
* colours
* Some chunk loading
* Proper loading and unloading
* Better loading
* Fix parallax and movement sounds
* Anchoring support + decal setup
* Most of the way to load and unload
* Decal loading kinda werkin
* large trees
* started diffing
* a
* Variant support and deserts
* a
* snow
* agony, even
* working again
* todo
* a
* laba tiles
* aeiou
* a
# Conflicts:
# Resources/Prototypes/Entities/Tiles/planet.yml
# Resources/Prototypes/Tiles/planet.yml
# Resources/Textures/Tiles/Planet/Lava/lava.rsi/meta.json
* laba
* Add lava
* Initial ignition
* triggers
* a
* a
* y
* Add basalt tiles
Did some unconventional things for the animation + rocks.
* fixies
* mergies
* promotion
* lava biome
* Lava planet start
* cleanup and more lava
* laba
* maccas
* biome stuf
* weh
* bongflicts
* aeaeae
* More fixes
* a
* these too
2023-02-12 02:15:09 +00:00
metalgearsloth
bfac53e7bc
Per-map parallax support ( #9786 )
...
* Per-map parallax support
* Comments for future sloth
* c
* bet
* Fix exception
* VV support
* Fix parallax
* mem
* weightless sounds
* Gravity stuff
* placeholder coz im too lazy to stash don't @ me son
* decent clouds
* sky
* Fast parallax
* Imagine spelling
* Loicense
* perish
* Fix weightless status
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com >
2022-07-25 00:10:23 -05:00
