rannosam/Wizzard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 2 Releases Wiki Activity

Compare commits

base: rannosam:c55ce49733687d3e4b69b669447a58158db1dad4
Branches Tags
rannosam:master
..
compare: rannosam:486862aa829170bb1cc6699bfa77d3548e7ec2f9
Branches Tags
rannosam:master

No commits in common. "c55ce49733687d3e4b69b669447a58158db1dad4" and "486862aa829170bb1cc6699bfa77d3548e7ec2f9" have entirely different histories.
c55ce49733 ... 486862aa82

17 changed files with 22863 additions and 3954 deletions
Show Stats Expand all files Collapse all files

BIN
HandyMann/Content/VRTemplate/Audio/LightningShoot.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Audio/LightningShoot.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Audio/Zap.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Blueprints/BP_ArrowSpell.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Blueprints/BP_ExplosionSpell.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Blueprints/BP_LaserBeam.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Blueprints/VRPawn.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Content/VRTemplate/Maps/VRTemplateMap.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Intermediate/CachedAssetRegistry_0.bin
View File

Binary file not shown.

4
HandyMann/Intermediate/PipInstall/Lib/site-packages/plugin_site_package.pth
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

BIN
HandyMann/Intermediate/ReimportCache/3688439234.bin
View File

Binary file not shown.

BIN
HandyMann/Saved/AutoScreenshot.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
HandyMann/Saved/Autosaves/Game/VRTemplate/Blueprints/VRPawn_Auto1.uasset (Stored with Git LFS)
View File

Binary file not shown.

1471
HandyMann/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini
View File

File diff suppressed because one or more lines are too long

3106
HandyMann/Saved/Logs/HandyMann.log
View File

File diff suppressed because it is too large Load Diff

22189
HandyMann/Saved/Logs/HandyMann_2.log Normal file
View File

File diff suppressed because it is too large Load Diff

14
HandyMann/Saved/SourceControl/UncontrolledChangelists.json
View File

@ -5,8 +5,6 @@
"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",
@ -31,24 +29,12 @@
"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",