Commit Graph

10 Commits

Author SHA1 Message Date
MarcoHampel
a758aa515c Prep Merge branch 'main' into guns 2023-11-20 20:34:09 -05:00
Osvetamp4
76e65ba44e Added isFalling variable to PlayerAnimation 2023-11-17 19:49:27 -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
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
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