From 2f2c4b91a11968455ae30a76d0c4ba7e1c67e5ab Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 14 Jul 2016 14:51:46 +0200 Subject: [PATCH 1/3] 3.6.2 --- README.md | 2 +- addons/main/script_mod.hpp | 2 +- docs/README_DE.md | 2 +- docs/README_PL.md | 2 +- mod.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a3b34a2c3b..4af32fd2a2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- ACE3 Version + ACE3 Version ACE3 Issues 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/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 @@

- ACE3 Version + ACE3 Version 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 @@

- ACE3 Wersja + ACE3 Wersja 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"; From 43c1c89cc12a8eef5efae85d1a22cb7eeb6c24c6 Mon Sep 17 00:00:00 2001 From: ColdEvul Date: Thu, 14 Jul 2016 03:34:06 +0200 Subject: [PATCH 2/3] Made new APEX crates draggable --- addons/dragging/CfgVehicles.hpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) 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 From 492f075ac87d3c19e34416b4b2fcf62dad442492 Mon Sep 17 00:00:00 2001 From: ColdEvul Date: Thu, 14 Jul 2016 02:09:17 +0200 Subject: [PATCH 3/3] Added fixed name for `Weapon_SMG_05_F` (MP5K) for EDEN item. --- addons/realisticnames/CfgVehicles.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); };