diff --git a/addons/compat_csla/README.md b/addons/compat_csla/README.md deleted file mode 100644 index 2e8db7022..000000000 --- a/addons/compat_csla/README.md +++ /dev/null @@ -1,4 +0,0 @@ -compat_csla -=== - -Compatibility with Arma 3 Creator DLC: [CSLA Iron Curtain](https://store.steampowered.com/app/1294440/Arma_3_Creator_DLC_CSLA_Iron_Curtain/). diff --git a/addons/compat_gm/README.md b/addons/compat_gm/README.md deleted file mode 100644 index 67adcdb5c..000000000 --- a/addons/compat_gm/README.md +++ /dev/null @@ -1,4 +0,0 @@ -compat_gm -=== - -Compatibility with Arma 3 Creator DLC: [Global Mobilization - Cold War Germany](http://www.global-mobilization.com/). diff --git a/addons/compat_sog/README.md b/addons/compat_sog/README.md deleted file mode 100644 index 6be5f0721..000000000 --- a/addons/compat_sog/README.md +++ /dev/null @@ -1,4 +0,0 @@ -compat_sog -=== - -Compatibility with Arma 3 Creator DLC: [S.O.G. Prairie Fire](https://www.sogpf.com/). diff --git a/addons/compat_spe/README.md b/addons/compat_spe/README.md deleted file mode 100644 index 099367089..000000000 --- a/addons/compat_spe/README.md +++ /dev/null @@ -1,4 +0,0 @@ -compat_spe -=== - -Compatibility with Arma 3 Creator DLC: [Spearhead 1944](https://spearhead-1944.com/). diff --git a/addons/compat_ws/README.md b/addons/compat_ws/README.md deleted file mode 100644 index 4a810196e..000000000 --- a/addons/compat_ws/README.md +++ /dev/null @@ -1,4 +0,0 @@ -compat_ws -=== - -Compatibility with Arma 3 Creator DLC: [Western Sahara](https://store.steampowered.com/app/1681170/Arma_3_Creator_DLC_Western_Sahara/). diff --git a/addons/sys_core/XEH_postInit.sqf b/addons/sys_core/XEH_postInit.sqf index 4b76ab77f..3b2743aee 100644 --- a/addons/sys_core/XEH_postInit.sqf +++ b/addons/sys_core/XEH_postInit.sqf @@ -13,6 +13,8 @@ if (!hasInterface) exitWith {}; // Ensure the TeamSpeak plugin handler code is initialized first [] call EFUNC(sys_io,startServer); +if (("acre" callExtension "version") == "") then { ERROR_WITH_TITLE("ACRE","Plugin not found"); }; + ["handleGetClientID", FUNC(handleGetClientID)] call EFUNC(sys_rpc,addProcedure); ["handleGetPluginVersion", FUNC(handleGetPluginVersion)] call EFUNC(sys_rpc,addProcedure); ["handleGetHeadVector", FUNC(handleGetHeadVector)] call EFUNC(sys_rpc,addProcedure); diff --git a/addons/sys_external/fnc_getSharedExternalRadios.sqf b/addons/sys_external/fnc_getSharedExternalRadios.sqf index 0527a8bfd..d7243bba5 100644 --- a/addons/sys_external/fnc_getSharedExternalRadios.sqf +++ b/addons/sys_external/fnc_getSharedExternalRadios.sqf @@ -20,6 +20,10 @@ params ["_unit"]; private _radios = [_unit] call EFUNC(sys_core,getGear); private _radioList = _radios select {_x call EFUNC(sys_radio,isUniqueRadio)}; -if (!(alive _unit) || {captive _unit}) exitWith {_radioList}; +if ( + !(alive _unit) || + {captive _unit} || + {lifeState _unit isEqualTo "INCAPACITATED"} +) exitWith {_radioList}; _radioList select {[_x, "getState", "radioShared"] call EFUNC(sys_data,dataEvent)} diff --git a/docs/_includes/custom/functions-list-api.html b/docs/_includes/custom/functions-list-api.html index 4d1fc8f48..725621f99 100644 --- a/docs/_includes/custom/functions-list-api.html +++ b/docs/_includes/custom/functions-list-api.html @@ -1323,6 +1323,7 @@ ### acre_api_fnc_setItemRadioReplacement __Description__ +DEPRECATED! Replaced by CBA Setting. Set the radio type to replace "ItemRadio" in unit inventories. By default this is the "ACRE_PRC343" __Parameters__ diff --git a/docs/css/customstyles.css b/docs/css/customstyles.css index 0bb4f4a5f..b3cacc186 100644 --- a/docs/css/customstyles.css +++ b/docs/css/customstyles.css @@ -1177,6 +1177,44 @@ h4.panel-title { margin-top: 0px; } +/*set navbar breakpoint so that it converts to hamburger earlier */ + +@media (max-width: 1200px) { + .navbar-header { + float: none; + } + .navbar-left,.navbar-right { + float: none !important; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + } + .navbar-fixed-top { + top: 0; + border-width: 0 0 1px; + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin-top: 7.5px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + .collapse.in{ + display:block !important; + } +} + /* Nicer keyboard tags */ kbd { display: inline-block; @@ -1191,3 +1229,22 @@ kbd { border-radius: 3px; box-shadow: inset 0 -1px 0 #bbb; } + +@media only screen and (min-width : 481px) { + .flex-row { + display: flex; + flex-wrap: wrap; + } + .flex-row > [class*='col-'] { + display: flex; + flex-direction: column; + } + .flex-row.row:after, + .flex-row.row:before { + display: flex; + } + + .flex-row > [class*='col-'] figcaption { + margin-bottom: 0px; + } +} diff --git a/docs/images/compats/acre2_csla_compat_small-logo.png b/docs/images/compats/acre2_csla_compat_small-logo.png new file mode 100644 index 000000000..aa458755e Binary files /dev/null and b/docs/images/compats/acre2_csla_compat_small-logo.png differ diff --git a/docs/images/compats/acre2_gm_compat_small-logo.png b/docs/images/compats/acre2_gm_compat_small-logo.png new file mode 100644 index 000000000..96127e6b2 Binary files /dev/null and b/docs/images/compats/acre2_gm_compat_small-logo.png differ diff --git a/docs/images/compats/acre2_sog_compat_small-logo.png b/docs/images/compats/acre2_sog_compat_small-logo.png new file mode 100644 index 000000000..644253f4f Binary files /dev/null and b/docs/images/compats/acre2_sog_compat_small-logo.png differ diff --git a/docs/images/compats/acre2_spe_compat_small-logo.png b/docs/images/compats/acre2_spe_compat_small-logo.png new file mode 100644 index 000000000..a2d458557 Binary files /dev/null and b/docs/images/compats/acre2_spe_compat_small-logo.png differ diff --git a/docs/images/compats/acre2_ws_compat_small-logo.png b/docs/images/compats/acre2_ws_compat_small-logo.png new file mode 100644 index 000000000..ca7d4a1ae Binary files /dev/null and b/docs/images/compats/acre2_ws_compat_small-logo.png differ diff --git a/docs/wiki/user/feature-list.md b/docs/wiki/user/feature-list.md index 29d2332db..9ecd850c3 100644 --- a/docs/wiki/user/feature-list.md +++ b/docs/wiki/user/feature-list.md @@ -44,6 +44,7 @@ This playtesting allows us to guarantee that ACRE2 supports, without glitches, 1 - Antennas and Components - Ground spike antenna + ## Direct Communications - Babel (TVT Languages) @@ -67,3 +68,38 @@ Babel provides a method for a mission maker to give each side or individual play #### TVT Radio Setups ACRE has always supported assigning different radios and frequencies to different sides. We pioneered, almost 4 years ago, making ACRE radio's physical objects. This means that the radio's configuration is tracked with the object. If a radio is dropped, or collected off a dead player, the other player sees that radios configuration and can use it. This, combined with babel, allows for many different TVT scenarios and added levels of great gameplay. + + +## Creator DLC Compatibility + +ACRE2 provides contributed compatibility components for several Creator DLCs. This includes accurate terrain data for signal calculations as it cannot be automatically generated on map load due to encrypted publishing. Compatibility is automatically loaded for any loaded Creator DLC. + +
+
+{% include image.html file="compats/acre2_gm_compat_small-logo.png" url="https://store.steampowered.com/app/1294440/Arma_3_Creator_DLC_CSLA_Iron_Curtain/" alt="Global Mobilization Compatibility Logo" caption="Global Mobilization" %} + +Accurate terrain data for signal calculations. +
+
+{% include image.html file="compats/acre2_sog_compat_small-logo.png" url="https://www.sogpf.com/" alt="S.O.G. Prairie Fire Compatibility Logo" caption="S.O.G. Prairie Fire" %} + +Accurate terrain data for signal calculations. Use of AN/PRC-77 in the co-op campaign. +
+
+{% include image.html file="compats/acre2_ws_compat_small-logo.png" url="https://store.steampowered.com/app/1681170/Arma_3_Creator_DLC_Western_Sahara/" alt="Western Sahara Compatibility Logo" caption="Western Sahara" %} + +Accurate terrain data for signal calculations. +
+
+{% include image.html file="compats/acre2_csla_compat_small-logo.png" url="https://www.global-mobilization.com/" alt="CSLA Iron Curtain Compatibility Logo" caption="CSLA Iron Curtain" %} + +Accurate terrain data for signal calculations. +
+
+{% include image.html file="compats/acre2_spe_compat_small-logo.png" url="https://spearhead-1944.com/" alt="Spearhead 1944 Logo" caption="Spearhead 1944" %} + +Accurate terrain data for signal calculations. AN/PRC-77 equipped automatically in radio backpacks. Customized radio racks, including special command vehicles with additional radios. +
+
+ +{% include note.html content="Creator DLC compatibilities are contributed by their authors or other contributors. IDI-Systems only serves as a publisher to facilitate easier distribution and collaboration." %}