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

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 Stats Download Patch File Download Diff File Expand all files Collapse all files

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/AstronautMixamo/Animations/PlayerAnimation.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Characters/AstronautMixamo/Animations/PlayerMovement.uasset (Stored with Git LFS)
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/AstronautModel.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Scripting/Enumerations/MovementState.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/ThirdPerson/Input/Actions/IA_ToggleGun.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/ThirdPerson/Input/IMC_Default.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZO/10YRBB1ONRG0CH810A68HN.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.