Commit Graph

11 Commits

Author SHA1 Message Date
MarcoHampel
666d168efe readded gun toggle event to event graph 2023-09-27 21:14:13 -04:00
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
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
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
Madhav Kapa
5231bf9aff steam stuff 2023-09-22 19:40:19 -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
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
3941fd1ac3 first push 2023-09-15 23:55:04 -04:00
Madhav Kapa
2ec39d75cb create game 2023-09-12 21:51:28 -04:00