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 remote-tracking branch 'refs/remotes/acemod/master'

Browse Source
This commit is contained in:
nomisum 2016-03-05 12:43:27 +01:00
commit e36198561f
26 changed files with 91 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -6,9 +6,6 @@
<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">
</a>
<a href="https://github.com/acemod/ACE3/releases/download/v3.5.0/ace3_3.5.0.zip">
<img src="https://img.shields.io/badge/Download-72.6_MB-green.svg?style=flat-square" alt="ACE3 Download">
</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">
</a>

2
addons/common/functions/fnc_addScrollWheelEventHandler.sqf
View File

@ -15,6 +15,8 @@
params ["_statement"];
ACE_DEPRECATED("ace_common_fnc_addScrollWheelEventHandler", "3.8.0", "'MouseZChanged' Display EventHandler");
if (_statement isEqualType "") then {
_statement = compile _statement;
};

16
addons/common/init_handleModifierKey.sqf
View File

@ -12,9 +12,17 @@
*/
#include "script_component.hpp"
disableSerialization;
_this spawn {//
waitUntil {!isNull findDisplay 46};//
sleep 2;//
params ["_display"];
disableSerialization;
_display displayAddEventHandler ["KeyDown", FUNC(handleModifierKey)];
_display displayAddEventHandler ["KeyUp", FUNC(handleModifierKeyUp)];
params ["_display"];
_display displayAddEventHandler ["KeyDown", {_this call FUNC(handleModifierKey)}];
_display displayAddEventHandler ["KeyUp", {_this call FUNC(handleModifierKeyUp)}];
};//
//@todo, remove all lines with comments after CBA update, events rewrite branch
// note 2, will break in save games after ~ 10 seconds thanks to CBA, fixed with above

6
addons/dragging/CfgEventHandlers.hpp
View File

@ -55,3 +55,9 @@ class Extended_AnimChanged_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/dragging/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/dragging/XEH_postInit.sqf
View File

@ -8,8 +8,6 @@ if (isServer) then {
if (!hasInterface) exitWith {};
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
if (isNil "ACE_maxWeightDrag") then {
ACE_maxWeightDrag = 800;
};

6
addons/explosives/CfgEventHandlers.hpp
View File

@ -32,3 +32,9 @@ class Extended_Put_EventHandlers {
GVAR(takeHandler) = QUOTE([ARR_3(_this select 1, _this select 0, _this select 2)] call FUNC(onInventoryChanged));
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/explosives/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/explosives/XEH_postInit.sqf
View File

@ -81,5 +81,3 @@ if (isServer) then {
_this call FUNC(interactEH);
}] call EFUNC(common,addEventHandler);
[{(_this select 0) call FUNC(handleScrollWheel);}] call EFUNC(common,addScrollWheelEventHandler);

6
addons/interaction/CfgEventHandlers.hpp
View File

@ -24,3 +24,9 @@ class Extended_Respawn_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/interaction/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/interaction/XEH_postInit.sqf
View File

@ -32,8 +32,6 @@ if (!hasInterface) exitWith {};
GVAR(isOpeningDoor) = false;
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
["tapShoulder", {
params ["_unit", "_shoulderNum"];

6
addons/sandbag/CfgEventHandlers.hpp
View File

@ -32,3 +32,9 @@ class Extended_Killed_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/sandbag/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/sandbag/XEH_postInit.sqf
View File

@ -11,8 +11,6 @@ GVAR(sandBag) = objNull;
GVAR(deployPFH) = -1;
GVAR(deployDirection) = 0;
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
// Cancel deploy sandbag if interact menu opened
["interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call EFUNC(common,addEventHandler);

6
addons/tacticalladder/CfgEventHandlers.hpp
View File

@ -24,3 +24,9 @@ class Extended_Killed_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/tacticalladder/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/tacticalladder/XEH_postInit.sqf
View File

@ -16,8 +16,6 @@ GVAR(currentAngle) = 0;
// Cancel adjustment if interact menu opens
["interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call EFUNC(common,addEventHandler);
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
// Cancel adjusting on player change.
["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
["playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);

6
addons/trenches/CfgEventHandlers.hpp
View File

@ -24,3 +24,9 @@ class Extended_Killed_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/trenches/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/trenches/XEH_postInit.sqf
View File

@ -12,8 +12,6 @@ GVAR(trench) = objNull;
GVAR(digPFH) = -1;
GVAR(digDirection) = 0;
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
// Cancel dig sandbag if interact menu opened
["interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call EFUNC(common,addEventHandler);

6
addons/tripod/CfgEventHandlers.hpp
View File

@ -32,3 +32,9 @@ class Extended_Killed_EventHandlers {
};
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
};
};

5
addons/tripod/XEH_missionDisplayLoad.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];

2
addons/tripod/XEH_postInit.sqf
View File

@ -9,8 +9,6 @@ GVAR(height) = 0;
// Cancel adjustment if interact menu opens
["interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call EFUNC(common,addEventHandler);
[{_this call FUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
// Cancel adjusting on player change.
["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
["playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);

3
docs/README_DE.md
View File

@ -6,9 +6,6 @@
<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">
</a>
<a href="https://github.com/acemod/ACE3/releases/download/v3.5.0/ace3_3.5.0.zip">
<img src="https://img.shields.io/badge/Download-72.6_MB-green.svg?style=flat-square" alt="ACE3 Download">
</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">
</a>

3
docs/README_PL.md
View File

@ -5,9 +5,6 @@
<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">
</a>
<a href="https://github.com/acemod/ACE3/releases/download/v3.5.0/ace3_3.5.0.zip">
<img src="https://img.shields.io/badge/Pobierz-65.7_MB-green.svg?style=flat-square" alt="ACE3 Pobierz">
</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">
</a>