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
10,294 Commits 73 Branches 88 Tags 752 MiB
541349efef
Commit Graph

245 Commits

Author SHA1 Message Date
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
PabstMirror
bbc708e3e0 Less aggressive overlap detection 
Ensure the 2d screen pos distance is significant.
 2016-07-02 22:46:36 -05:00
Glowbal
afb9eb3084 Merge pull request #3342 from acemod/vehicleInteractionDistance 
Uniformize interaction distance for vehicle based on bounding box
 2016-06-20 09:55:55 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
6a58af5b33 fix save game crash?, ref #3397 2016-03-06 06:22:38 +01:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
esteldunedain
a86bbdb162 Prevent the interact menu from closing when moving the mouse during animations 2016-02-27 15:47:23 -03:00
esteldunedain
121663226c Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases. 2016-02-27 15:44:53 -03:00
esteldunedain
ff04ca8981 Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people. 2016-02-18 20:20:02 -03:00
esteldunedain
cebc8a2d07 Slightly reduce the distance for which the LOS check is skipped. Fix #3270 2016-02-08 19:19:10 -03:00
PabstMirror
dd979676fd Remove use of CAManBase for all mans 
End use of bandaid from #1294
 2016-01-09 22:05:40 -06:00
PabstMirror
a161008eb7 Fix count/forEach 2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
PabstMirror
ff3ddbe287 Building Interact - Dummy object instead of hiding 
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
 2015-12-15 12:04:03 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
d037f00a92 fix forEachIndex capitalization 2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
PabstMirror
8d2b612570 Remove nametags and actions on hidden units 
Fix #2596
 2015-11-28 21:35:25 -06:00
PabstMirror
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
PabstMirror
3ec9fca73e local -> private 2015-11-17 14:06:12 -06:00
PabstMirror
554c303be0 InteractionMenu - Auto Expand First Level 2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24 Interaction Menu - Add setting for animation speed 2015-10-20 13:26:42 -05:00
PabstMirror
4a935eb129 Remove debug 2015-09-26 22:02:44 -05:00
PabstMirror
174d8ac306 #2486 - Run color setup on settingsInit 2015-09-26 22:02:05 -05:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
commy2
7a4c37c085 disable all actions on ladders by default, close #2289 2015-08-30 22:03:45 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
PabstMirror
9aed148e8a Default Action parameters is [] for self (ref #2228) 
Makes it match fnc_compileMenu.sqf
 2015-08-23 00:16:01 -05:00
PabstMirror
253fb6e66a Merge pull request #1986 from acemod/addMainAction 
Always make sure ACE_MainActions exists
 2015-08-14 19:48:04 -05:00
PabstMirror
6ca3761710 AddAction basic param checking 2015-08-13 11:54:26 -05:00
PabstMirror
207c002f3a params 2015-08-09 13:02:08 -05:00
PabstMirror
5723c5eaac Merge branch 'master' into addMainAction 2015-08-09 13:00:56 -05:00
Michael Braun
77e62946ae Updated parameterization in Interact_menu module. 2015-08-05 00:47:18 +02:00
PabstMirror
93d2035fed #1984 - Always make sure ACE_MainActions exists 
Also add debuging output when adding action with no parent
 2015-08-02 15:33:16 -05:00