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

Browse Source

# Conflicts:
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset
#	Assets/_Content/Prefabs/OctoPlayerFP.prefab
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs

...

This commit is contained in:

Ferlat Thibaud

2026-06-03 13:52:36 +02:00

parent bf9a4e64ca fc362d0e23

commit 3c8e9080f3

64 changed files with 6855 additions and 4698 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/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset

+318 -702

File diff suppressed because one or more lines are too long