Prep Merge branch 'main' into guns

added bullets
Auto stash before merge of "guns" and "origin/guns"
2023-11-20 20:34:09 -05:00 · 2023-11-20 20:18:41 -05:00 · 2023-11-17 19:55:38 -05:00 · 2023-11-18 01:53:51 +01:00 · 2023-11-17 19:06:59 -05:00 · 2023-11-13 19:49:06 -05:00
14 changed files with 37 additions and 15 deletions
--- 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)
+
--- a/Content/3DModels/Shapes/Black.uasset
+++ b/Content/3DModels/Shapes/Black.uasset
--- a/Content/3DModels/Shapes/Sphere.uasset
+++ b/Content/3DModels/Shapes/Sphere.uasset
--- a/Content/3DModels/Shapes/WhiteUnshaded.uasset
+++ b/Content/3DModels/Shapes/WhiteUnshaded.uasset
--- a/Content/3DModels/Weapons/Bullet/Bullet.uasset
+++ b/Content/3DModels/Weapons/Bullet/Bullet.uasset
--- a/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset
+++ b/Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset
--- a/Content/Levels/MainMenu/CameraActor.uasset
+++ b/Content/Levels/MainMenu/CameraActor.uasset
--- a/Content/Levels/MainMenu/MainMenu.umap
+++ b/Content/Levels/MainMenu/MainMenu.umap
--- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
+++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
--- a/Content/ThirdPerson/Input/Actions/IA_Aim.uasset
+++ b/Content/ThirdPerson/Input/Actions/IA_Aim.uasset
--- a/Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset
+++ b/Content/ThirdPerson/Input/Actions/IA_Aim_Pressed.uasset
--- a/Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset
+++ b/Content/ThirdPerson/Input/Actions/IA_Aim_Released.uasset
--- a/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset
+++ b/Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset
--- a/Content/ThirdPerson/Input/IMC_Default.uasset
+++ b/Content/ThirdPerson/Input/IMC_Default.uasset
Author	SHA1	Message	Date
MarcoHampel	a758aa515c	Prep Merge branch 'main' into guns	2023-11-20 20:34:09 -05:00
MarcoHampel	85f9449bf3	added bullets	2023-11-20 20:18:41 -05:00
MarcoHampel	357d531662	Auto stash before merge of "guns" and "origin/guns"	2023-11-17 19:55:38 -05:00
Osveta.mp4	88bba3561c	Merge pull request 'Added isFalling variable to PlayerAnimation' (#29 ) from isFalling_checker into main Reviewed-on: Station_Obscurum/StationObscurum#29 Reviewed-by: mhampel1 <hampel.m@northeastern.edu>	2023-11-18 01:53:51 +01:00
MarcoHampel	5da6cc62d3	added sphere targeting	2023-11-17 19:06:59 -05:00
MarcoHampel	d83ac78af1	Updated Gun Mode to not raycast when gun is not drawn	2023-11-13 19:49:06 -05:00
MarcoHampel	ea356d22ef	Updated to aim on aim button clicked and shifted camera.	2023-11-12 12:28:08 -05:00
MarcoHampel	b2d1e1f4af	finally fixed input!	2023-11-06 20:13:59 -05:00