Merge branch 'main' of https://cgvrgit.ulno.net/EgonVM/VR2024_WizardVR

Browse Source

# Conflicts:
#	TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Rune.uasset

...

This commit is contained in:

DOMENIS\ukuvarbl

2024-05-22 13:07:57 +03:00

parent a2c05b1706 7709508611

commit 6e3acf444b

3 changed files with 279 additions and 2 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

BIN

TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Rune.uasset

Binary file not shown.