Merge pull request 'Merge Guns Into Main' (#31) from guns into main
Skipped Review on: Station_Obscurum/StationObscurum#31
This commit is contained in:
commit
330b54f917
@ -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
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
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
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
BIN
Content/3DModels/Weapons/Bullet/Bullet.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset
(Stored with Git LFS)
BIN
Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/MainMenu/CameraActor.uasset
(Stored with Git LFS)
BIN
Content/Levels/MainMenu/CameraActor.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/MainMenu/MainMenu.umap
(Stored with Git LFS)
BIN
Content/Levels/MainMenu/MainMenu.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
(Stored with Git LFS)
BIN
Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/ThirdPerson/Input/Actions/IA_Aim.uasset
(Stored with Git LFS)
BIN
Content/ThirdPerson/Input/Actions/IA_Aim.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset
(Stored with Git LFS)
Normal file
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
BIN
Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset
(Stored with Git LFS)
BIN
Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/ThirdPerson/Input/IMC_Default.uasset
(Stored with Git LFS)
BIN
Content/ThirdPerson/Input/IMC_Default.uasset
(Stored with Git LFS)
Binary file not shown.
Reference in New Issue
Block a user