From b2d1e1f4afa2efb853349c5ffa93f7f90bdbe973 Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Mon, 6 Nov 2023 20:13:59 -0500 Subject: [PATCH 1/6] finally fixed input! --- Config/DefaultInput.ini | 4 ++++ Content/Levels/MainMenu/CameraActor.uasset | 4 ++-- Content/Levels/MainMenu/MainMenu.umap | 2 +- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset | 4 ++-- Content/ThirdPerson/Input/IMC_Default.uasset | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 58fc9cb..1a56471 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -84,3 +84,7 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul -ConsoleKeys=Tilde +ConsoleKeys=Tilde +[/Script/InputEditor.EnhancedInputEditorProjectSettings] +DefaultEditorInputClass=/Script/EnhancedInput.EnhancedPlayerInput ++DefaultMappingContexts=(InputMappingContext="/Game/ThirdPerson/Input/IMC_Default.IMC_Default",Priority=0) + diff --git a/Content/Levels/MainMenu/CameraActor.uasset b/Content/Levels/MainMenu/CameraActor.uasset index c429f44..231b5a6 100644 --- a/Content/Levels/MainMenu/CameraActor.uasset +++ b/Content/Levels/MainMenu/CameraActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ffbac17ebcb9157918181c271d4c335e4e7f8873a52ab4b2fc8ab06fec5d344 -size 42961 +oid sha256:12d1223211ab71a6ef03dd9c67c14d70cdcf7b253f39d0a3056db7b36eab034d +size 43615 diff --git a/Content/Levels/MainMenu/MainMenu.umap b/Content/Levels/MainMenu/MainMenu.umap index 4818966..680de74 100644 --- a/Content/Levels/MainMenu/MainMenu.umap +++ b/Content/Levels/MainMenu/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f651de54d610974469b408081170351bd9c79e802d754d001710efe1b9eb2ac +oid sha256:72d5d0bf2e414b4369486cd48cf777f397bb4b3c52ec701510e0bbdb4a91bb52 size 77629 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 2082d8c..5d0e9bc 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5df9c0272243b5c37cfb115690bcbc17969f8984b3abe9548e2a8282f1293600 -size 190807 +oid sha256:9b46d62d4710dccdb3117538bd7c681c589c8ff7e4f8029d74b6fc996be23e34 +size 184888 diff --git a/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset b/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset index 7761796..9ea0f56 100644 --- a/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset +++ b/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6f2bcd2fcdd397e016f0823b5feea56fd9e5ab76f0352442903375340770685 -size 1379 +oid sha256:e4425dee1a3ea39088c589e4f0e5ceb6fcaaea4f7ee8b94bca3c6ded8f5536eb +size 1660 diff --git a/Content/ThirdPerson/Input/IMC_Default.uasset b/Content/ThirdPerson/Input/IMC_Default.uasset index c5d086c..9ce7902 100644 --- a/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47fad118748d19b1acdf1cd04b99a89f12847ca673760458e74025cd72d28eaa +oid sha256:a60c77f48e50e8298a3f86d473bed923eb629d9b5ce09c859154e7f0a28c4add size 18831 From ea356d22efbf8e204ee0fce60870676a41441266 Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Sun, 12 Nov 2023 12:28:08 -0500 Subject: [PATCH 2/6] Updated to aim on aim button clicked and shifted camera. --- .../AstronautMixamo/Animations/PlayerAnimation.uasset | 4 ++-- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- Content/ThirdPerson/Input/Actions/IA_Aim.uasset | 4 ++-- Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset | 3 +++ Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset | 3 +++ Content/ThirdPerson/Input/IMC_Default.uasset | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset create mode 100644 Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset index c2d1e58..0394b53 100644 --- a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset +++ b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:440ec8612b776cb152ba65e5272d6350e7a933fff451c88982d173a2a24fc84d -size 114561 +oid sha256:e243db515c09256b934668b997a59d05e05199ba2048d963f7948a2608640899 +size 114217 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 5d0e9bc..95ce306 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b46d62d4710dccdb3117538bd7c681c589c8ff7e4f8029d74b6fc996be23e34 -size 184888 +oid sha256:09a456941614ead1d448230d09c649e8c59bd20129855b4b52ad2dfdfe7278ad +size 276323 diff --git a/Content/ThirdPerson/Input/Actions/IA_Aim.uasset b/Content/ThirdPerson/Input/Actions/IA_Aim.uasset index 35b4582..33a0316 100644 --- a/Content/ThirdPerson/Input/Actions/IA_Aim.uasset +++ b/Content/ThirdPerson/Input/Actions/IA_Aim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8856d24ca9b06c42b8052294da610b6ed1a54a4c8c57b84d58b5696663e8368 -size 1349 +oid sha256:032fc17291ba6929bb6fe1f4011bb8444b4779bcc45825edf32290cdaa2ce445 +size 1706 diff --git a/Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset b/Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset new file mode 100644 index 0000000..d738510 --- /dev/null +++ b/Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a31ec78b8334cbca66ac1f0a240e876a844aa06b0f63fae2e9bce4f5a6e69178 +size 1672 diff --git a/Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset b/Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset new file mode 100644 index 0000000..6351e53 --- /dev/null +++ b/Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69c82851573ca10c02e3db3f7061feee883354d636bbb71ceee5417442201339 +size 1678 diff --git a/Content/ThirdPerson/Input/IMC_Default.uasset b/Content/ThirdPerson/Input/IMC_Default.uasset index 9ce7902..e65a6ff 100644 --- a/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a60c77f48e50e8298a3f86d473bed923eb629d9b5ce09c859154e7f0a28c4add -size 18831 +oid sha256:cce619a0be80cc6d933f5e8af2b82d4ceabdb3164196f229941d632f7c83dc4a +size 22234 From d83ac78af15faf7e71517a6b3ec3f39f9dc2414f Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Mon, 13 Nov 2023 19:49:06 -0500 Subject: [PATCH 3/6] Updated Gun Mode to not raycast when gun is not drawn --- .../AstronautMixamo/Animations/PlayerAnimation.uasset | 2 +- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset index 0394b53..60caba8 100644 --- a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset +++ b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e243db515c09256b934668b997a59d05e05199ba2048d963f7948a2608640899 +oid sha256:83e27319ca9a7d78362e027aa818e4382e89b46897df3e83dcffa987c6a404aa size 114217 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 95ce306..4c10dfe 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09a456941614ead1d448230d09c649e8c59bd20129855b4b52ad2dfdfe7278ad -size 276323 +oid sha256:d68fb9db38e43fbec9f54cebc587056eb1a43db4cb15a9b68ae349f07957e2f2 +size 296031 From 5da6cc62d3aa37d4eacfe5554c735f74ffa4bedb Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Fri, 17 Nov 2023 19:06:59 -0500 Subject: [PATCH 4/6] added sphere targeting --- Content/3DModels/Shapes/Sphere.uasset | 3 +++ Content/3DModels/Shapes/WhiteUnshaded.uasset | 3 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Content/3DModels/Shapes/Sphere.uasset create mode 100644 Content/3DModels/Shapes/WhiteUnshaded.uasset diff --git a/Content/3DModels/Shapes/Sphere.uasset b/Content/3DModels/Shapes/Sphere.uasset new file mode 100644 index 0000000..a4aef00 --- /dev/null +++ b/Content/3DModels/Shapes/Sphere.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2ddfa4a56a47683eed32014bb7b30f625ef7fa46bd23bda302b7da85c2bdfd +size 48636 diff --git a/Content/3DModels/Shapes/WhiteUnshaded.uasset b/Content/3DModels/Shapes/WhiteUnshaded.uasset new file mode 100644 index 0000000..995f2ba --- /dev/null +++ b/Content/3DModels/Shapes/WhiteUnshaded.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c86e16a846f7d3a85b0caa12f13c65fd2c7d4513a877de6f479da8b263cb29c +size 8734 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 4c10dfe..34f7133 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d68fb9db38e43fbec9f54cebc587056eb1a43db4cb15a9b68ae349f07957e2f2 -size 296031 +oid sha256:b5f794eaebf5a71171d8c2971973c468e00f96fc092848107edd654347f5ed53 +size 303696 From 357d5316624f96a01c72f34c81a9090c48f4efd7 Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Fri, 17 Nov 2023 19:55:38 -0500 Subject: [PATCH 5/6] Auto stash before merge of "guns" and "origin/guns" --- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 34f7133..871bd76 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f794eaebf5a71171d8c2971973c468e00f96fc092848107edd654347f5ed53 -size 303696 +oid sha256:2c587dabd605d404f6238bdbd71cb779b4a9aaeaa4defbad349beeb14b528b9d +size 298317 From 85f9449bf3536cd2ed762ce68d84cbee3ee6c36d Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Mon, 20 Nov 2023 20:18:41 -0500 Subject: [PATCH 6/6] added bullets --- Content/3DModels/Shapes/Black.uasset | 3 +++ Content/3DModels/Weapons/Bullet/Bullet.uasset | 3 +++ Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Content/3DModels/Shapes/Black.uasset create mode 100644 Content/3DModels/Weapons/Bullet/Bullet.uasset diff --git a/Content/3DModels/Shapes/Black.uasset b/Content/3DModels/Shapes/Black.uasset new file mode 100644 index 0000000..d658e76 --- /dev/null +++ b/Content/3DModels/Shapes/Black.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5e289297450a52fe5a2731878bb4ca66579f2d9701b9ffd56680181c6a4800e +size 6706 diff --git a/Content/3DModels/Weapons/Bullet/Bullet.uasset b/Content/3DModels/Weapons/Bullet/Bullet.uasset new file mode 100644 index 0000000..6e79044 --- /dev/null +++ b/Content/3DModels/Weapons/Bullet/Bullet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e5c54e569b69f8b9167ef5d672b7491feaac7b92dd98ccdc0c3f241a2470772 +size 53517 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 871bd76..0cc1ba6 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c587dabd605d404f6238bdbd71cb779b4a9aaeaa4defbad349beeb14b528b9d -size 298317 +oid sha256:14880ec491adcec54352decf9e87bcf10cd7f4f41a95f514ab2f0fae3465ab8d +size 336803