Ed 4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2024-12-22 15:48:30 +03:00

..

blurryx.swsl

Eye damage (#10262)

2022-08-13 22:59:14 -07:00

blurryy.swsl

Eye damage (#10262)

2022-08-13 22:59:14 -07:00

camera_static.swsl

Surveillance cameras (#8246)

2022-05-31 18:44:57 +10:00

cataracts.swsl

Blindness hotfix (content side) (#23465)

2024-01-04 11:17:06 +11:00

circle_mask.swsl

Blindness hotfix (content side) (#23465)

2024-01-04 11:17:06 +11:00

colored_screen_border.swsl

Fix shader problems on GLES2

2021-03-11 19:04:21 +01:00

cooldown.swsl

GLES2: Fixes, clarifications to shaders

2020-08-29 19:55:16 +01:00

displacement.swsl

Displacement map prototype (#26709)

2024-04-27 16:03:58 +10:00

drunk.swsl

Fix compatibility mode drunk shader (#9053)

2022-06-22 23:20:39 -07:00

flashed_effect.swsl

Flash overlay rework and bugfixes (#27369)

2024-06-02 00:17:53 -04:00

gradient_circle_mask.swsl

Damage masks (#9402)

2022-07-06 17:58:14 +10:00

greyscale_fullscreen.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

greyscale.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

hcut.swsl

Update hcut.swsl (#284)

2024-06-27 14:35:06 +03:00

hologram.swsl

Holopads (#32711)

2024-12-17 20:18:15 +01:00

outline.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

paperstamp.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

radial_blur.swsl

Add haloperidol, potassium iodide (#27454)

2024-08-03 03:12:08 +10:00

radiation.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

rainbow.swsl

Shader cleanup - applies DRY to various shaders in the game (#23294)

2024-01-03 19:35:25 +11:00

singularity.swsl

Fix compatibility mode singularity shader (#7856)

2022-04-29 15:45:05 +02:00

stealth.swsl

Fix compat mode stealth shader (#11833)

2022-10-11 11:55:19 +11:00

stencil_clear.swsl

GLES2: Content shader stuff (possibly unfinished)

2020-08-28 00:04:44 +01:00

stencil_mask.swsl

GLES2: Fixes, clarifications to shaders

2020-08-29 19:55:16 +01:00

texture.swsl

Fix shader problems on GLES2

2021-03-11 19:04:21 +01:00

world_gradient_circle.swsl

Gateway destinations (#21040)

2023-11-14 19:23:40 -07:00