diff --git a/README.md b/README.md index a3b34a2c3b..4af32fd2a2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ <p align="center"> <a href="https://github.com/acemod/ACE3/releases/latest"> - <img src="https://img.shields.io/badge/Version-3.6.1-blue.svg?style=flat-square" alt="ACE3 Version"> + <img src="https://img.shields.io/badge/Version-3.6.2-blue.svg?style=flat-square" alt="ACE3 Version"> </a> <a href="https://github.com/acemod/ACE3/issues"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues"> diff --git a/addons/dragging/CfgVehicles.hpp b/addons/dragging/CfgVehicles.hpp index ba4ff87186..3f5dbce327 100644 --- a/addons/dragging/CfgVehicles.hpp +++ b/addons/dragging/CfgVehicles.hpp @@ -69,6 +69,33 @@ class CfgVehicles { GVAR(canCarry) = 1; GVAR(canDrag) = 1; }; + class Box_Syndicate_Ammo_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(canDrag) = 1; + }; + class Box_IED_Exp_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(canDrag) = 1; + }; + class Box_Syndicate_Wps_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(canDrag) = 1; + }; + class Box_Syndicate_WpsLaunch_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(canDrag) = 1; + }; + + class Box_NATO_Equip_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(carryDirection) = 270; + GVAR(canDrag) = 1; + }; + class Box_NATO_Uniforms_F: ReammoBox_F { + GVAR(canCarry) = 1; + GVAR(carryDirection) = 270; + GVAR(canDrag) = 1; + }; // Remove Larger crate dragging support. // Would be better to allow some sort of joint push/drag functionality diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 2a2927010d..56add6aead 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -5,7 +5,7 @@ #define MAJOR 3 #define MINOR 6 -#define PATCHLVL 1 +#define PATCHLVL 2 #define BUILD 0 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD diff --git a/addons/realisticnames/CfgVehicles.hpp b/addons/realisticnames/CfgVehicles.hpp index 6f3cc8b32e..f53465b08f 100644 --- a/addons/realisticnames/CfgVehicles.hpp +++ b/addons/realisticnames/CfgVehicles.hpp @@ -513,7 +513,11 @@ class CfgVehicles { class Weapon_SMG_02_F: Weapon_Base_F { displayName = CSTRING(SMG_02_Name); }; - + + class Weapon_SMG_05_F: Weapon_Base_F { + displayName = CSTRING(SMG_05); + }; + class Weapon_hgun_PDW2000_F: Weapon_Base_F { displayName = CSTRING(hgun_PDW2000_Name); }; diff --git a/docs/README_DE.md b/docs/README_DE.md index 82db0f1063..9e1bcec8ab 100644 --- a/docs/README_DE.md +++ b/docs/README_DE.md @@ -4,7 +4,7 @@ <p align="center"> <a href="https://github.com/acemod/ACE3/releases"> - <img src="https://img.shields.io/badge/Version-3.6.1-blue.svg?style=flat-square" alt="ACE3 Version"> + <img src="https://img.shields.io/badge/Version-3.6.2-blue.svg?style=flat-square" alt="ACE3 Version"> </a> <a href="https://github.com/acemod/ACE3/issues"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Fehlermeldungen"> diff --git a/docs/README_PL.md b/docs/README_PL.md index 9033dc453b..703613142e 100644 --- a/docs/README_PL.md +++ b/docs/README_PL.md @@ -3,7 +3,7 @@ </p> <p align="center"> <a href="https://github.com/acemod/ACE3/releases"> - <img src="https://img.shields.io/badge/Wersja-3.6.1-blue.svg?style=flat-square" alt="ACE3 Wersja"> + <img src="https://img.shields.io/badge/Wersja-3.6.2-blue.svg?style=flat-square" alt="ACE3 Wersja"> </a> <a href="https://github.com/acemod/ACE3/issues"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia"> diff --git a/mod.cpp b/mod.cpp index 7e70a36f84..146b821534 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,8 +1,8 @@ -name = "Advanced Combat Environment 3.6.1"; +name = "Advanced Combat Environment 3.6.2"; picture = "logo_ace3_ca.paa"; actionName = "GitHub"; action = "https://github.com/acemod/ACE3"; -description = "ACE3 - Version 3.6.1"; +description = "ACE3 - Version 3.6.2"; logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3";