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 'master' into release-3.12.4

Browse Source
This commit is contained in:
PabstMirror 2018-11-25 10:51:31 -06:00
commit bd5b360d7e
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/arsenal/functions/fnc_addVirtualItems.sqf
View File

@ -193,8 +193,8 @@ if (_items isEqualType true) then {
switch true do {
// Rifle, handgun, secondary weapons mags
case (
((getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) ||
{(getNumber (_x >> QGVAR(hide))) == -1}) &&
((getNumber (configFile >> "CfgMagazines" >> _x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) ||
{(getNumber (configFile >> "CfgMagazines" >> _x >> QGVAR(hide))) == -1}) &&
{!(_x in _grenadeList)} &&
{!(_x in _putList)}
): {

3
addons/markers/functions/fnc_movePFH.sqf
View File

@ -22,8 +22,9 @@ if (isNull _ctrlMap || !GVAR(moving)) exitWith {
(_this select 1) call CBA_fnc_removePerFrameHandler;
private _finalPos = getMarkerPos _marker;
private _overrule = [QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent;
if !([QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent) then {
if (!isNil "_overrule" && {_overrule isEqualTo true}) then {
_marker setMarkerPosLocal _originalPos;
} else {
[QGVAR(setMarkerPosLocal), [_marker, _finalPos]] call CBA_fnc_globalEvent;

4
addons/microdagr/functions/fnc_updateDisplay.sqf
View File

@ -167,7 +167,9 @@ case (APP_MODE_WAYPOINTS): {
} forEach _waypoints;
_currentIndex = (_currentIndex max 0) min (count _waypoints);
_wpListBox lbSetCurSel _currentIndex;
if ((lbCurSel _wpListBox) != _currentIndex) then {
_wpListBox lbSetCurSel _currentIndex;
};
//Reset focus to a dummy ctrl (top button), otherwise HOME/POS1 key goes to top of listBox and has keybind blocked
ctrlSetFocus (_display displayCtrl IDC_TOPMENUBUTTON);

1
docs/team.md
View File

@ -56,6 +56,7 @@ This lists all the maintainers responsible for project management and the overal
- tpM
- [Kieran](https://github.com/kieran-s){:target="_blank"}
- [Giallustio](https://github.com/Giallustio){:target="_blank"}
- [654wak654](https://github.com/654wak654){:target="_blank"}
## Contributors