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

Browse Source

# Conflicts:
#	Assets/Scripts/Editor/FBXImporter/processed_fbx.txt
#	Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx

...

This commit is contained in:

Ferlat Thibaud

2026-03-25 19:58:12 +01:00

parent f1d06c7b87 4bbb14439d

commit 0c0a539af3

36 changed files with 695 additions and 180 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/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx

BIN

Binary file not shown.