EgonVM
/
VR2024_WizardVR
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'AttemptOne' 

# Conflicts:
#	TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_RuneArea.uasset
#	TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Spell.uasset
#	TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Wand.uasset
This commit is contained in:
DOMENIS\ukuvarbl 2024-05-23 18:04:14 +03:00
parent 84d7ee1dfb 87db7b742a
commit 35d0e30199
13 changed files with 2836 additions and 1789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_RuneArea.uasset
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Spell.uasset
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Wand.uasset
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_WandParticles.uasset Normal file
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_WizardGameMode.uasset
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Maps/TheMainWorld.umap
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Content/ProjectAssets/Particles/NG_WandBurst.uasset Normal file
View File

Binary file not shown.

BIN
TheProject/VRWizardProject/Saved/Autosaves/PackageRestoreData.json
View File

Binary file not shown.

82
TheProject/VRWizardProject/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini
View File

File diff suppressed because one or more lines are too long

8
TheProject/VRWizardProject/Saved/Config/WindowsEditor/Engine.ini
View File

@ -76,3 +76,11 @@ JavaPath=(Path="")
TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/OpenWorld.OpenWorld",Map="/Engine/Maps/Templates/OpenWorld",DisplayName="Open World",Category="OpenWorld") TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/OpenWorld.OpenWorld",Map="/Engine/Maps/Templates/OpenWorld",DisplayName="Open World",Category="OpenWorld")
TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/Basic.Basic",Map="/Engine/Maps/Templates/Template_Default",DisplayName="Basic",Category="") TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/Basic.Basic",Map="/Engine/Maps/Templates/Template_Default",DisplayName="Basic",Category="")
[WindowsApplication.Accessibility]
StickyKeysHotkey=True
ToggleKeysHotkey=True
FilterKeysHotkey=True
StickyKeysConfirmation=True
ToggleKeysConfirmation=True
FilterKeysConfirmation=True

2
TheProject/VRWizardProject/Saved/Config/WindowsEditor/Niagara.ini
View File

File diff suppressed because one or more lines are too long

4531
TheProject/VRWizardProject/Saved/Logs/VRWizardProject.log
View File

File diff suppressed because one or more lines are too long

2
TheProject/VRWizardProject/Saved/SourceControl/UncontrolledChangelists.json
View File

@ -15,6 +15,8 @@
"D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Particles/NG_MagicBurst.uasset", "D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Particles/NG_MagicBurst.uasset",
"D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Spell.uasset", "D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_Spell.uasset",
"D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_WizardGameMode.uasset", "D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_WizardGameMode.uasset",
"D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Particles/NG_WandBurst.uasset",
"D:/EgonVM/The Project/TheProject/VRWizardProject/Content/ProjectAssets/Blueprints/BP_WandParticles.uasset",
"E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/StarterContent/Architecture/Floor_400x400.uasset", "E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/StarterContent/Architecture/Floor_400x400.uasset",
"E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/ProjectAssets/Props/Runes/Object_4.uasset", "E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/ProjectAssets/Props/Runes/Object_4.uasset",
"E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/ProjectAssets/Props/Runes/Object_6.uasset", "E:/Unreal Projects/vr_VRWizardProject/VR2024_WizardVR/TheProject/VRWizardProject/Content/ProjectAssets/Props/Runes/Object_6.uasset",