Compare commits

...

11 Commits

87 changed files with 4056 additions and 40563 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1 @@
<<<<<<< HEAD
E:/UE_5.5/Engine/Plugins/Runtime/USDCore/Content/Python/Lib/Win64/site-packages
=======
D:/Program Files/Epic Games/UE_5.5/Engine/Plugins/Runtime/USDCore/Content/Python/Lib/Win64/site-packages
>>>>>>> 486862aa829170bb1cc6699bfa77d3548e7ec2f9

Binary file not shown.

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,4 +1,5 @@
;METADATA=(Diff=true, UseCommands=true)
[/Script/UnrealEd.UnrealEdOptions]
UsingXGE=False
bExpandCustomClassPickerClassList=True

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -5,55 +5,30 @@
"guid": "00000000000000000000000000000000",
"description": "Default Uncontrolled Changelist",
"files": [
<<<<<<< HEAD
=======
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/StarterContent/Architecture/Floor_400x400.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/teleports/teleport_spell_1.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/teleports/teleport_spell_2.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/teleports/teleport_spell_3.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/teleports/teleport_spell_4.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/teleports/teleport_spell_4_Cue.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_1_Cue.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_SpawnPoint.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_1.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_1_1_.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_2.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_2_1_.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_3.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_3_1_.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_4.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_4_1_.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_5.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Audio/music/Action_5_1_.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_EnemyGoblin.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/M_balckvoid.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/WidgetMenu.uasset",
"D:/R. Samuel/VR-tasks/Wizard game/Wizzard/HandyMann/Content/VRTemplate/Blueprints/Menu.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Audio/LightningShoot.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/EnemyAI/BB_Goblin.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/EnemyAI/BTService_UpdateAttackRange.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/EnemyAI/BT_Goblin.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_Spawner.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/AP_EnemyAI.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_EnemyGoblin.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/EnemyAI/AIC_Enemy.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/GoblinWalkBlendSpace1D.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/AP_GoblinAI.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_EnemyAI.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_HealthComponent.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_ArrowSpell.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_Fireball.uasset",
>>>>>>> 486862aa829170bb1cc6699bfa77d3548e7ec2f9
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Input/Actions/IA_Shoot_Left.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Input/IMC_Default.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_Fireball.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Input/Actions/Hands/IA_Hand_ThumbUp_Left.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Input/IMC_Hands.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_ArrowSpell.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_LaserBeam.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_ExplosionSpell.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Audio/Zap.uasset",
"C:/Users/Admin/Desktop/VR/Wizzard/HandyMann/Content/VRTemplate/Audio/LightningShoot.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_EnemyAI.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/forest_guard_attack_4__Anim_Montage.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/forest_guard_dead_Anim_Montage.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/Animations/AI/forest_guard_get_hit_L_Anim_Montage.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_HealthComponent.uasset",
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_Fireball.uasset",
"D:/Darius/UnrealProjects/Wizzard/Wizzard/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_Fireball.uasset",
"D:/Darius/UnrealProjects/Wizzard/Wizzard/Wizzard/HandyMann/Content/VRTemplate/Input/Actions/IA_Shoot_Right.uasset",
"D:/Darius/UnrealProjects/Wizzard/Wizzard/Wizzard/HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap",
"D:/Darius/UnrealProjects/Wizzard/Wizzard/Wizzard/HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset",
"D:/Darius/UnrealProjects/Wizzard/Wizzard/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_LaserBeam.uasset"
"A:/Documents/Unreal Projects/Wizzard/HandyMann/Content/VRTemplate/Blueprints/BP_ExplosionSpell.uasset"
]
}
]