Compare commits
3 Commits
486862aa82
...
c55ce49733
| Author | SHA1 | Date | |
|---|---|---|---|
| c55ce49733 | |||
| 0e5f5ac2be | |||
| cee5a723bb |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1,5 @@
|
||||
<<<<<<< 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.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,8 @@
|
||||
"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",
|
||||
@@ -29,12 +31,24 @@
|
||||
"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",
|
||||
>>>>>>> 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/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",
|
||||
|
||||
Reference in New Issue
Block a user