diff --git a/Content/Characters/Common/Montages/Smg/smg_reload_Montage.uasset b/Content/Characters/Common/Montages/Smg/smg_reload_Montage.uasset new file mode 100644 index 000000000..04878542f Binary files /dev/null and b/Content/Characters/Common/Montages/Smg/smg_reload_Montage.uasset differ diff --git a/Content/Characters/Common/Skeleton/Cloud9CharacterSkeleton.uasset b/Content/Characters/Common/Skeleton/Cloud9CharacterSkeleton.uasset index 7932cf1f7..8af5eca4a 100644 Binary files a/Content/Characters/Common/Skeleton/Cloud9CharacterSkeleton.uasset and b/Content/Characters/Common/Skeleton/Cloud9CharacterSkeleton.uasset differ diff --git a/Content/Characters/Sas/Mesh/ctm_sas_varianta.uasset b/Content/Characters/Sas/Mesh/ctm_sas_varianta.uasset index 61ac4b60d..26de83272 100644 Binary files a/Content/Characters/Sas/Mesh/ctm_sas_varianta.uasset and b/Content/Characters/Sas/Mesh/ctm_sas_varianta.uasset differ diff --git a/Content/Maps/warmup.umap b/Content/Maps/warmup.umap index 6752c3080..36a86e255 100644 Binary files a/Content/Maps/warmup.umap and b/Content/Maps/warmup.umap differ diff --git a/Content/Weapons/FirearmWeaponsTable.uasset b/Content/Weapons/FirearmWeaponsTable.uasset index ff6818c89..b2ceefe24 100644 Binary files a/Content/Weapons/FirearmWeaponsTable.uasset and b/Content/Weapons/FirearmWeaponsTable.uasset differ diff --git a/Content/Weapons/Rifle/m4a1s/Materials/MI_w_rifle_m4a1s_csgo2048.uasset b/Content/Weapons/Rifle/m4a1s/Materials/MI_w_rifle_m4a1s_csgo2048.uasset new file mode 100644 index 000000000..6a6d26811 Binary files /dev/null and b/Content/Weapons/Rifle/m4a1s/Materials/MI_w_rifle_m4a1s_csgo2048.uasset differ diff --git a/Content/Weapons/Rifle/m4a1s/Textures/w_rifle_m4a1s_csgo2048.uasset b/Content/Weapons/Rifle/m4a1s/Textures/w_rifle_m4a1s_csgo2048.uasset new file mode 100644 index 000000000..7920645a0 Binary files /dev/null and b/Content/Weapons/Rifle/m4a1s/Textures/w_rifle_m4a1s_csgo2048.uasset differ diff --git a/Content/Weapons/Smg/mp9/Mesh/w_smg_mp9_weapon.uasset b/Content/Weapons/Smg/mp9/Mesh/w_smg_mp9_weapon.uasset index 722a6648e..fd4472ab2 100644 Binary files a/Content/Weapons/Smg/mp9/Mesh/w_smg_mp9_weapon.uasset and b/Content/Weapons/Smg/mp9/Mesh/w_smg_mp9_weapon.uasset differ diff --git a/Content/Weapons/WeaponTableDefinitions.uasset b/Content/Weapons/WeaponTableDefinitions.uasset index ce0332e39..a0292b067 100644 Binary files a/Content/Weapons/WeaponTableDefinitions.uasset and b/Content/Weapons/WeaponTableDefinitions.uasset differ diff --git a/Importing/textures/m4a1s_csgo2048.tga b/Importing/textures/m4a1s_csgo2048.tga new file mode 100644 index 000000000..a3997e234 Binary files /dev/null and b/Importing/textures/m4a1s_csgo2048.tga differ diff --git a/Source/Cloud9/Weapon/Enums/WeaponSlot.h b/Source/Cloud9/Weapon/Enums/WeaponSlot.h index 04ab890e7..02bd7cc53 100644 --- a/Source/Cloud9/Weapon/Enums/WeaponSlot.h +++ b/Source/Cloud9/Weapon/Enums/WeaponSlot.h @@ -1,4 +1,4 @@ -// Copyright (c) 2023 Alexei Gladkikh +// Copyright (c) 2023 Alexei Gladkikh // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -72,8 +72,8 @@ class CLOUD9_API UWeaponSlot : public UBlueprintFunctionLibrary { case EWeaponType::Pistol: return TEXT("ReloadPistolSocket"); - // case EWeaponType::Smg: - // return TEXT("ReloadSmgSocket"); + case EWeaponType::Smg: + return TEXT("ReloadSmgSocket"); case EWeaponType::Shotgun: return TEXT("ReloadShotgunSocket"); case EWeaponType::Rifle: