Merge branch 'main' of https://cgvrgit.ulno.net/kristo.krikmann/DrownedCityVR

Browse Source

# Conflicts:
#	DrownedCityVR/Content/Blueprints/Gears/Sound/gear_turning.uasset

...

This commit is contained in:

DOMENIS\hanshara

2026-05-26 23:09:54 +03:00

parent 0327e2fb66 4567a71337

commit b74fcd80fe

11 changed files with 20 additions and 8 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

.DS_Store

Vendored

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/BP_FireTrigger.uasset

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/BP_Log.uasset

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/Gears/Sound/gear_turning.uasset

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/Gears/Sound/gears_turning.uasset

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/Level_1.umap

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/Blueprints/Level_5_Fire.umap

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/VRTemplate/Maps/LightingAndMainRocks1.umap

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/VRTemplate/Maps/LightingAndMainRocks3.umap

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/VRTemplate/Maps/Terrace.umap

LFS

BIN

Binary file not shown.

DrownedCityVR/Content/VRTemplate/Maps/World1.umap

LFS

BIN

Binary file not shown.