Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

Browse Source

# Conflicts:
#	Assets/_Content/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset
#	Assets/_Content/Prefabs/OctoPlayerFP.prefab
#	Assets/_Content/Scenes/BodiesInWater.unity

...

This commit is contained in:

tiboFDG

2026-05-26 20:19:12 +02:00

parent e7d5ef04dd c9b517959e

commit a847d6a454

29 changed files with 1483 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Assets/_Content/Scenes/BodiesInWater.unity

+296

File diff suppressed because one or more lines are too long