90d9db59d2
Merge branch 'main' into music-import
2023-09-28 03:00:21 +02:00
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
MarcoHampel
fc80b26826
royalty free music from unity imported
2023-09-26 20:09:21 -04: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
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
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
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
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
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
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
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
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
Madhav Kapa
2ec39d75cb
create game
2023-09-12 21:51:28 -04:00
3b827606d7
Initial commit
2023-09-13 03:44:11 +02:00
