Merge Weapons into Main (#23)

Browse Source

**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

...

This commit is contained in:

mhampel1

2023-09-28 03:00:02 +02:00

parent c2b301e5fe

commit 97e255047b

18 changed files with 46 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.