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

Compare commits

base: Station_Obscurum:integrate_astronaut
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
..
compare: Station_Obscurum:mhampel1-patch-1
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

29 Commits
integrate_ ... mhampel1-p

Author SHA1 Message Date
MarcoHampel
6d5a5c12a0 sln added test 2023-10-09 19:21:04 -04:00
mhampel1
ccc6e270ed Update '.gitignore' 2023-10-10 01:20:08 +02:00
MarcoHampel
c05ac50454 gun aiming and moving added 2023-10-02 21:07:15 -04:00
mhampel1
987f002ba2 Merge pull request 'readded the gun toggle event 2' (#27) from quickfix into main 
Reviewed-on: Station_Obscurum/StationObscurum#27
 2023-09-28 03:23:36 +02:00
MarcoHampel
6ad75ef9cc readded the gun toggle event 2 2023-09-27 21:22:58 -04:00
mhampel1
3e062da899 Merge pull request 'Readded Gun Toggle Event' (#26) from weapons2 into main 
Reviewed-on: Station_Obscurum/StationObscurum#26
 2023-09-28 03:16:12 +02:00
MarcoHampel
666d168efe readded gun toggle event to event graph 2023-09-27 21:14:13 -04:00
mhampel1
abcd4f5740 royalty free music from unity imported (#25) 
**Content:**
- Imported music files from unity to unreal.
	- Scott buckley music needs credits:

```
    'Path Through The Mountains' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au

    'The Long Dark' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au

    'A Kind Of Hope' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au

    'Hymn To The Dawn' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au

    'Last And First Light' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au

    'Legacy' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
```

Co-authored-by: MarcoHampel <sebastianhampel1@gmail.com>
Reviewed-on: Station_Obscurum/StationObscurum#25
 2023-09-28 03:00:33 +02:00
mhampel1
97e255047b Merge Weapons into Main (#23) 
**Content:**
- Imported basic shooting animations
- Implemented blending of shooting animations with standard
- Created enum to track current state (gun, carry or default)
- Added functionality to toggle between shooting and walking.
- Added Gun 3d Model.

Co-authored-by: MarcoHampel <sebastianhampel1@gmail.com>
Reviewed-on: Station_Obscurum/StationObscurum#23
 2023-09-28 03:00:02 +02:00
Madhav Kapa
c2b301e5fe Merge branch 'volumetrics' into main 2023-09-22 22:30:14 -04:00
MarcoHampel
e9fb0083b9 Merge remote-tracking branch 'origin/main' into volumetrics 2023-09-22 22:25:15 -04:00
MarcoHampel
2344da39b5 Title added 2023-09-22 22:14:51 -04:00
madhavkapa
b292643d99 Merge pull request 'steam stuff' (#14) from steam into main 
Reviewed-on: Station_Obscurum/StationObscurum#14
 2023-09-23 01:41:44 +02:00
madhavkapa
167cdac7a7 Merge branch 'main' into steam 2023-09-23 01:41:36 +02:00
Madhav Kapa
5231bf9aff steam stuff 2023-09-22 19:40:19 -04:00
madhavkapa
e273d42466 Merge pull request 'Revert "Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main"' (#13) from revertds into main 
Reviewed-on: Station_Obscurum/StationObscurum#13
 2023-09-23 00:46:10 +02:00
mhampel1
196bd4547c Revert "Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main" 
This reverts commit bab889485a.
 2023-09-22 18:44:33 -04:00
MarcoHampel
07fe6b9ee6 Slight modifications to Orange Material 2023-09-19 22:50:45 -04:00
MarcoHampel
a54351ca11 Added Pack and Volumetrics. 
Volumetrics, lighting and pack 3D models added. Orange material added, glowing core material added.
 2023-09-19 22:31:50 -04:00
mhampel1
bab889485a Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main 
Reviewed-on: Station_Obscurum/StationObscurum#10
:|
 2023-09-19 01:42:07 +02:00
Madhav Kapa
ba05d894bc ds_controller support 2023-09-18 19:40:39 -04:00
madhavkapa
58a5fd1656 Merge pull request 'character_dev' (#9) from character_dev into main 
Reviewed-on: Station_Obscurum/StationObscurum#9
 2023-09-19 01:23:38 +02:00
mhampel1
a0d8c1c414 Merge character_dev into main. (#6) 
**Items:**
- Imported the Astronaut 3D model using Mixamo's Auto-skinning tool.
- Created a Animation Blend and Animation Blueprint for animating the character.
- Imported the Boots and Helmet 3D models.
- Modified the 3rd Person Character Blueprint to use the Astronaut Model and Astronaut Animation Blueprint.

Co-authored-by: MarcoHampel <sebastianhampel1@gmail.com>
Reviewed-on: Station_Obscurum/StationObscurum#6
 2023-09-18 04:49:22 +02:00
MarcoHampel
a6f161820b Cleaned up Characters folder. 
Removed old blueprints and imports from first animation attempt.
 2023-09-17 22:15:40 -04:00
MarcoHampel
34ffb3e64d Finished base line Animation System for Astronaut. 
- Usable player that can run with a working camera is complete.
 2023-09-17 22:10:41 -04:00
MarcoHampel
630f2e1d5b Working Animation integration. WIP. 
- Working animation system integrated with player movement
- Fixing poor weights with a newly reskinned model.
 2023-09-17 21:39:53 -04:00
MarcoHampel
5a357ada99 Imported animations into astronaut in Unreal. 
Some animations are integrated with the player model. The player model has been added to the scene and is playable. Not all animations work and some slight changes need to be made.
 2023-09-17 17:31:27 -04:00
madhavkapa
d9e576906c Merge pull request 'first push' (#1) from new_branch into main 
Reviewed-on: Station_Obscurum/StationObscurum#1
 2023-09-16 07:02:45 +02:00
MarcoHampel
3941fd1ac3 first push 2023-09-15 23:55:04 -04:00
149 changed files with 1079 additions and 92 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,7 +35,6 @@
# These project files can be generated by the engine
*.xcodeproj
*.xcworkspace
*.sln
*.suo
*.opensdf
*.sdf

19
Config/DefaultEngine.ini
View File

@ -205,3 +205,22 @@ ConnectionType=USBOnly
bUseManualIPAddress=False
ManualIPAddress=
[/Script/Engine.GameEngine]
+NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemSteam.SteamNetDriver",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver")
[OnlineSubsystem]
DefaultPlatformService=Steam
[OnlineSubsystemSteam]
bEnabled=true
SteamDevAppId=480
; If using Sessions
; bInitServerOnClient=true
[/Script/OnlineSubsystemSteam.SteamNetDriver]
NetConnectionClassName="OnlineSubsystemSteam.SteamNetConnection"
[/Script/Engine.PhysicsSettings]
bSupportUVFromHitResults=True

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/AstronautMovement.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Idle/PlayerIdle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Idle/PlayerPistolIdle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Idle/X_Bot_Pistol_Idle_Up.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/PlayerAnimationBlueprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Running/PlayerPistol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_Take_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Animations/Running/PlayerRunning_Anim_mixamo_com.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/AstronautRetargeter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/AstronautRig.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Astronaut_with_skeleton_updated_no_feet_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Jute_Matting.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Leather_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/Metal_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/SubModels/Degradable_Metal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/SubModels/Helmet_Solo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/SubModels/Material_010.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/SubModels/Metal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/Astronaut/SubModels/helmet_glass.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/AstronautModel.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/AstronautModel_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/AstronautModel_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/AstronautShoes.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/Leather.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/Material_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/Material_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/Material_010.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Boots/Metal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Helmet/Degradable_Metal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Helmet/Fluffy_White_Towel.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Helmet/Helmet_Solo.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Helmet/helmet_glass.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Air.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_004.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_005.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_006.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_007.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cylinder.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FinalBaseMesh.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FrontHolder.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FrontHolder_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Pack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Jute_Matting.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Leather.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Leather_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Leather_Strips_01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Leather_procedural.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_004.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_005.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_006.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_007.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_008.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/Pack/Material_009.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/AstronautPack_Joined.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Leather_Strips_01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Leather_procedural.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_004.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_005.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_006.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_007.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_008.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_009.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Levels/MainMenu/CameraPawn.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Levels/MainMenu/MenuGamemode.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More