Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source
This commit is contained in:
jonpas 2016-03-19 20:39:20 +01:00
commit a9256b6587
11 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -4,7 +4,7 @@
<p align="center"> <p align="center">
<a href="https://github.com/acemod/ACE3/releases"> <a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Version-3.5.0-blue.svg?style=flat-square" alt="ACE3 Version"> <img src="https://img.shields.io/badge/Version-3.5.1-blue.svg?style=flat-square" alt="ACE3 Version">
</a> </a>
<a href="https://github.com/acemod/ACE3/issues"> <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"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

6
addons/fastroping/CfgVehicles.hpp
View File

@ -35,8 +35,8 @@ class CfgVehicles {
}; };
}; };
class Helicopter; class Air;
class Helicopter_Base_F: Helicopter { class Helicopter: Air {
class ACE_SelfActions { class ACE_SelfActions {
class ACE_prepareFRIES { class ACE_prepareFRIES {
displayName = CSTRING(Interaction_prepareFRIES); displayName = CSTRING(Interaction_prepareFRIES);
@ -68,6 +68,8 @@ class CfgVehicles {
}; };
}; };
}; };
class Helicopter_Base_F;
class ACE_friesBase: Helicopter_Base_F { class ACE_friesBase: Helicopter_Base_F {
destrType = ""; destrType = "";
class Turrets {}; class Turrets {};

5
addons/fastroping/XEH_postInit.sqf
View File

@ -7,8 +7,3 @@
[QGVAR(startFastRope), { [QGVAR(startFastRope), {
[FUNC(fastRopeServerPFH), 0, _this] call CBA_fnc_addPerFrameHandler; [FUNC(fastRopeServerPFH), 0, _this] call CBA_fnc_addPerFrameHandler;
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
[QGVAR(ropeDetach), {
params ["_object", "_rope"];
_object ropeDetach _rope;
}] call EFUNC(common,addEventHandler);

7
addons/fastroping/functions/fnc_cutRopes.sqf
View File

@ -32,8 +32,11 @@ _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
}; };
}; };
[QGVAR(ropeDetach), [_hook, _ropeTop]] call EFUNC(common,serverEvent); //Destroy rope
[{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy, _hook], 60] call EFUNC(common,waitAndExecute); //Only delete the hook first so the rope falls down.
//Note: ropeDetach was used here before, but the command seems a bit broken.
deleteVehicle _hook;
[{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy], 60] call EFUNC(common,waitAndExecute);
} count _deployedRopes; } count _deployedRopes;
_vehicle setVariable [QGVAR(deployedRopes), [], true]; _vehicle setVariable [QGVAR(deployedRopes), [], true];

6
addons/fastroping/functions/fnc_fastRopeServerPFH.sqf
View File

@ -25,7 +25,7 @@ private ["_vectorUp", "_vectorDir", "_origin"];
if (vehicle _unit != _unit) exitWith {}; if (vehicle _unit != _unit) exitWith {};
//Start fast roping //Start fast roping
if (animationState _unit != "ACE_FastRoping") exitWith { if (getMass _dummy != 80) exitWith {
//Fix for twitchyness //Fix for twitchyness
_dummy setMass 80; _dummy setMass 80;
_dummy setCenterOfMass [0, 0, -2]; _dummy setCenterOfMass [0, 0, -2];
@ -38,7 +38,9 @@ if (animationState _unit != "ACE_FastRoping") exitWith {
}; };
//Check if rope broke and unit is falling //Check if rope broke and unit is falling
if (isNull attachedTo _unit) exitWith { //Make sure this isn't executed before the unit is actually fastroping
//Note: Stretching ropes does not change ropeLength
if ((isNull attachedTo _unit) && {ropeLength _ropeTop > 0.5}) exitWith {
[_pfhHandle] call CBA_fnc_removePerFrameHandler; [_pfhHandle] call CBA_fnc_removePerFrameHandler;
}; };

2
addons/main/script_mod.hpp
View File

@ -5,7 +5,7 @@
#define MAJOR 3 #define MAJOR 3
#define MINOR 5 #define MINOR 5
#define PATCHLVL 0 #define PATCHLVL 1
#define BUILD 0 #define BUILD 0
#define VERSION MAJOR.MINOR.PATCHLVL.BUILD #define VERSION MAJOR.MINOR.PATCHLVL.BUILD

2
addons/mk6mortar/functions/fnc_mortarInit.sqf
View File

@ -31,7 +31,7 @@ if (count magazines _mortar > 0) then {
private _currentWeapon = _mortar weaponsTurret [0] select 0; private _currentWeapon = _mortar weaponsTurret [0] select 0;
private _newWeapon = ""; private _newWeapon = "";
if (tolower _currentWeapon == "mortar_82mm") then { if (_currentWeapon == "mortar_82mm") then {
_newWeapon = "ace_mortar_82mm"; _newWeapon = "ace_mortar_82mm";
} else { } else {
_newWeapon = getText (configFile >> "CfgWeapons" >> _currentWeapon >> QGVAR(replaceWith)); _newWeapon = getText (configFile >> "CfgWeapons" >> _currentWeapon >> QGVAR(replaceWith));

2
addons/nametags/functions/fnc_drawNameTagIcon.sqf
View File

@ -36,7 +36,7 @@ _fnc_parameters = {
_icon = format [QUOTE(PATHTOF(UI\soundwave%1.paa)), floor random 10]; _icon = format [QUOTE(PATHTOF(UI\soundwave%1.paa)), floor random 10];
_size = 1; _size = 1;
} else { } else {
if (_drawRank) then { if (_drawRank && {rank _target != ""}) then {
_icon = format["\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa", toLower rank _target]; _icon = format["\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa", toLower rank _target];
_size = 1; _size = 1;
}; };

2
docs/README_DE.md
View File

@ -4,7 +4,7 @@
<p align="center"> <p align="center">
<a href="https://github.com/acemod/ACE3/releases"> <a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Version-3.5.0-blue.svg?style=flat-square" alt="ACE3 Version"> <img src="https://img.shields.io/badge/Version-3.5.1-blue.svg?style=flat-square" alt="ACE3 Version">
</a> </a>
<a href="https://github.com/acemod/ACE3/issues"> <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"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Fehlermeldungen">

2
docs/README_PL.md
View File

@ -3,7 +3,7 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/acemod/ACE3/releases"> <a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Wersja-3.5.0-blue.svg?style=flat-square" alt="ACE3 Wersja"> <img src="https://img.shields.io/badge/Wersja-3.5.1-blue.svg?style=flat-square" alt="ACE3 Wersja">
</a> </a>
<a href="https://github.com/acemod/ACE3/issues"> <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"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia">

4
mod.cpp
View File

@ -1,8 +1,8 @@
name = "Advanced Combat Environment 3.5.0"; name = "Advanced Combat Environment 3.5.1";
picture = "logo_ace3_ca.paa"; picture = "logo_ace3_ca.paa";
actionName = "GitHub"; actionName = "GitHub";
action = "https://github.com/acemod/ACE3"; action = "https://github.com/acemod/ACE3";
description = "ACE3 - Version 3.5.0"; description = "ACE3 - Version 3.5.1";
logo = "logo_ace3_ca.paa"; logo = "logo_ace3_ca.paa";
logoOver = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa";
tooltip = "ACE3"; tooltip = "ACE3";