Station_Obscurum/StationObscurum_Unreal
Archived
8
0
Fork 0
Code Issues 13 Pull Requests Packages Projects 1 Releases Wiki Activity

Compare commits

merge into: Station_Obscurum:mhampel1-patch-1
Branches Tags
Station_Obscurum:main Station_Obscurum:enemy_dev Station_Obscurum:level-design Station_Obscurum:guns Station_Obscurum:isFalling_checker Station_Obscurum:integrate_astronaut Station_Obscurum:mhampel1-patch-1 Station_Obscurum:quickfix
...
pull from: Station_Obscurum:guns
Branches Tags
Station_Obscurum:enemy_dev Station_Obscurum:main Station_Obscurum:level-design Station_Obscurum:guns Station_Obscurum:isFalling_checker Station_Obscurum:integrate_astronaut Station_Obscurum:mhampel1-patch-1 Station_Obscurum:quickfix

12 Commits
mhampel1-p ... guns

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
Osvetamp4
76e65ba44e Added isFalling variable to PlayerAnimation 2023-11-17 19:49:27 -05: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
mhampel1
1e4151a7d6 Merge pull request 'Merge Guns into Main' (#28) from guns into main 
Reviewed-on: Station_Obscurum/StationObscurum#28
 2023-10-17 00:51:52 +02:00
MarcoHampel
ad7590ffac updated to have aiming 2023-10-13 19:08:15 -04:00
MarcoHampel
cd0541c3f5 updated project files 2023-10-13 19:03:29 -04:00
65 changed files with 190 additions and 15 deletions
Expand all files Collapse all files

4
Config/DefaultInput.ini
View File

@ -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)

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/Animations/PlayerAnimation.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Levels/Template.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Levels/ThirdPersonMap.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/ThirdPerson/Input/Actions/IA_Aim.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/ThirdPerson/Input/IMC_Default.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/0/96/P5S6IBIGQ1NZG5ZRDPG3KW.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/0/GZ/7WHFM13LZEJEOGB9U7PUOW.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/0/NB/H41S8UH6SF1OXF12UH7V26.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/1/03/1JE0SFY9DKRM4RET2TYOH2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/1/6J/0HLS6R930YK30U6CJWL2L0.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/2/28/ROFVX6273YTQZEOGTLZWNZ.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/2/PR/7LCRUM97MC64VG09G4XMKK.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/2/Q0/OZKX1SKYMOMV6XF3HZC478.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/3/2I/UXUXKNVJWYYY7KY0SK0THV.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/3/O0/RFYWG98AYT62VMGJPYQZJ0.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/3/RZ/26CKMB9B16MGQ0JG6L5E4W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/3/WB/QD7EI6JBZWHIYA05M22CDZ.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/3/Y6/WIZ2Z0SG5390BX8FHBBPRG.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/4/5I/RP23QTTTD80HJT0M6V9LNM.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/4/AQ/Y1YGVVV2ELE9RM5E32PDZH.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/4/J1/1HV0VVWP5768OV13ULUQJC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/4/SJ/N1NNM4DXUBA1F1WBWGUGIU.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/5/IF/NCH8LL1O220CU71IBCH1Q4.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/5/OD/LLS9ORO4DG5XMG357NE5BU.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/5/QW/78OG68WRWHO6KNOE34STX0.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/7/4X/UMHLCEAAB8KE24MQDOXPSD.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/7/RM/1LEZQOIHW2R0MPKU1GQYEF.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/7/SC/7Y1OCF8SS25SIZ7QZ325GG.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/8/AT/J1ZLLVBNIG7P32TXX2JYJM.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/8/IG/2Q461K36F9CJNBNUS6E6TC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/9/9Q/ZFJI02AJ7XWWTZZ1C4IMJN.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/9/BP/7CY1OFJ1LCGBL3Z0UYARIV.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/9/TH/5PUCNK4O3H3FPSJMVKE0UP.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/9/V4/9GIW3O4Q3M6VU0PEQTUIA0.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/A/RL/E2UF1CZM2NXVLS0W4R5I0H.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/A/TB/W3L8QZNDYOVQM35Y62XO0D.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/C/12/4EPRXN67V98NXXUPASSD9W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/C/8S/YPGRFPSQPB6RNMU28BW2DS.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/C/91/57AJU0MTK30QB83W1SRGIP.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/C/I7/F3UET9KN79K0L3QO4EQYMN.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/C/RA/9QZGJ53TB7VP9W70WZ8WPZ.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/E/HE/GHR2JT8ZNCDEYM9TMLCBPA.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/E/JA/ZX8OYE51GFO4FE6GQB2YVF.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/E/Q7/43TF0LUUCV41U19SD2WJ3C.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/E/TN/JETLFBFXPIB72WUD0EMOUC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/E/ZV/JSMSMK7UDFFV7J45IWI5AY.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalActors__/Levels/Template/F/08/YAHEVWCBPBEC2OTVMT7231.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/0/GX/G4YKCN4QJAHSA9SXGNKT8L.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/2/V1/THNR39MC119R1RYSH7G75O.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/3/L0/0J6X3TTGYJBTXYSAVQ836H.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/A/SH/DMKSJLTLIP5GUQXAYXAEUB.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/C/8O/NVQCZXZZ3DLTHG0QR9DHEL.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/E/H1/7ST2P80YAT98CNBU1CK7GV.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/__ExternalObjects__/Levels/Template/E/OF/FW1PHHCZ6WPJW4EBKE1151.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.