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:isFalling_checker
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:main
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

13 Commits
isFalling_ ... main

Author SHA1 Message Date
mhampel1
5480c3216c Merge pull request 'Early Merge of Level Design into Main' (#33) from level-design into main 
Reviewed-on: Station_Obscurum/StationObscurum#33
 2023-11-28 01:59:39 +01:00
MarcoHampel
4f451e5afc updated lights, updated scripts 2023-11-27 19:54:52 -05:00
MarcoHampel
97cdb4cc76 added hallway and movmeent 2023-11-21 19:16:08 -05:00
MarcoHampel
f49be2edab Developing a testing level 2023-11-21 12:55:26 -05:00
mhampel1
330b54f917 Merge pull request 'Merge Guns Into Main' (#31) from guns into main 
Skipped Review on: Station_Obscurum/StationObscurum#31
 2023-11-21 02:35:09 +01:00
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
61 changed files with 174 additions and 20 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/Hallway/4WaySplitHallway_Door.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_Light.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_Light_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Hallway/4WaySplitHallway_Split.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/3DModels/Hallway/White_Wall-Freepoly_org.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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/3DModels/Weapons/GunLight.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/3DModels/Weapons/LowPolyScifiPistol.uasset (Stored with Git LFS)
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/Characters/AstronautMixamo/SubModels/Helmet/Helmet_Solo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Helmet/SimpleGlass.uasset (Stored with Git LFS) Normal file
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/TestingLevel.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/Emissive.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Materials/EmissiveRed.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/StarterContent/Materials/M_Wood_Pine.uasset (Stored with Git LFS)
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.