Merge Guns Into Main #31

Merged
mhampel1 merged 7 commits from guns into main 2023-11-21 02:35:11 +01:00
14 changed files with 37 additions and 15 deletions

View File

@ -84,3 +84,7 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul
-ConsoleKeys=Tilde -ConsoleKeys=Tilde
+ConsoleKeys=Tilde +ConsoleKeys=Tilde
[/Script/InputEditor.EnhancedInputEditorProjectSettings]
DefaultEditorInputClass=/Script/EnhancedInput.EnhancedPlayerInput
+DefaultMappingContexts=(InputMappingContext="/Game/ThirdPerson/Input/IMC_Default.IMC_Default",Priority=0)

BIN
Content/3DModels/Shapes/Black.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/3DModels/Shapes/Sphere.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/3DModels/Shapes/WhiteUnshaded.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/3DModels/Weapons/Bullet/Bullet.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Levels/MainMenu/CameraActor.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/MainMenu/MainMenu.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.