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

Browse Source

# Conflicts:
#	Assets/_Content/Models/Environments/BodiesInWater.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Materials.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta
#	Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs

...

This commit is contained in:

tiboFDG

2026-05-21 11:03:11 +01:00

parent 7ee8179b0b ce17cbbe8b

commit a47cebc99b

65 changed files with 8287 additions and 742 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/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset

+9 -402

File diff suppressed because one or more lines are too long