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
8,188 Commits 73 Branches 88 Tags 752 MiB
3d5ea74c7e
Commit Graph

531 Commits

Author SHA1 Message Date
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
PabstMirror
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
PabstMirror
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags 
fix missing magazines after certain scenarios
 2015-10-04 11:46:36 +02:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute 
Add WaitUntilAndExecute Function
 2015-10-04 11:45:54 +02:00
PabstMirror
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
PabstMirror
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
commy2
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
jonpas
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +02:00
commy2
dc7d24a3fd fix fixFloating resetting reflector hitpoints, close #2279 2015-09-26 14:38:50 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
jokoho48
4ad16ed938 fix that waitUntilAndExecute have a return 2015-09-25 13:29:39 +02:00
jokoho48
998fbcc403 Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-25 13:19:19 +02:00
commy2
43cdfaecc0 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-25 11:15:46 +02:00
commy2
412685e0ff fix some code was commented out in loadPersonLocal and unloadPersonLocal 2015-09-25 11:15:25 +02:00
PabstMirror
079d88ded7 Merge pull request #2509 from acemod/miscFixNilFunctions 
Fix some nil functions
 2015-09-21 20:36:09 -05:00
commy2
24f0df55a2 Merge pull request #2559 from acemod/340disableuserinputcleanup 
Use CBA PFH in disableUserInput
 2015-09-22 00:52:58 +02:00
jonpas
2e3014daa3 Merge branch 'master' into parseList 
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
 2015-09-21 22:46:01 +02:00
commy2
23e3db9cc0 use CBA pfh in disableUserInput and fix key input weirdness 2015-09-21 22:42:31 +02:00
commy2
f134a77e98 add and use deprecated macro 2015-09-21 22:09:54 +02:00
PabstMirror
d3c2420381 Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_doAnimation.sqf
 2015-09-21 15:08:43 -05:00
commy2
f8676afca4 use correct macro for rpt writing 2015-09-21 21:56:18 +02:00
commy2
441efcd65f change version number in deprecated log 2015-09-21 21:48:18 +02:00
commy2
af309b937b add depracted warnings 2015-09-21 21:25:18 +02:00
commy2
5a5242f1c9 more common code cleanup 2015-09-21 19:19:49 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
df3211cc42 more common code cleanup 2015-09-21 14:20:53 +02:00
commy2
b0f9eab1f7 more common code cleanup 2015-09-21 13:53:12 +02:00
commy2
5adca6616d Merge branch '323cleanuphitpoints' into commoncleanup10 2015-09-21 13:24:12 +02:00
commy2
9fa6eb0651 more common code cleanup 2015-09-21 13:08:10 +02:00
commy2
d802cdfb23 more common code cleanup 2015-09-21 01:41:17 +02:00
commy2
d449e4bd83 more common code cleanup 2015-09-21 01:07:49 +02:00
commy2
5f7d8c0095 more common code cleanup 2015-09-21 00:34:04 +02:00
commy2
1679235b51 more common code cleanup 2015-09-21 00:28:25 +02:00
PabstMirror
345b1f0f98 Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_execPersistentFnc.sqf
	addons/common/functions/fnc_execRemoteFnc.sqf
 2015-09-20 17:02:49 -05:00
commy2
1d4eb209a4 fix missing ; in dumpPerformanceCounters 2015-09-20 23:50:30 +02:00
commy2
ffc5a16384 more common code cleanup 2015-09-20 23:40:51 +02:00
commy2
a98a45e5d1 more common code cleanup 2015-09-20 23:18:51 +02:00
commy2
62ec00a251 more common code cleanup 2015-09-20 22:36:05 +02:00
commy2
5fd1938f25 more common code cleanup 2015-09-20 22:29:38 +02:00
commy2
493ce1b092 more common code cleanup 2015-09-20 22:16:51 +02:00
commy2
2348c25e1a more common code cleanup 2015-09-20 20:25:25 +02:00
PabstMirror
610fb0bb2c Fix Merge 2015-09-20 11:28:43 -05:00
PabstMirror
7687374fcf Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_resetAllDefaults.sqf
 2015-09-20 11:25:33 -05:00
commy2
0a01bbdc76 more common code cleanup 2015-09-20 16:56:35 +02:00
commy2
e62683a0c4 more common code cleanup 2015-09-20 16:40:49 +02:00
commy2
e8ebe87450 more common code cleanup 2015-09-20 15:52:40 +02:00
commy2
4c4785c140 Merge pull request #2535 from acemod/commoncleanup7 
common code cleanup part 7
 2015-09-20 11:06:38 +02:00
commy2
d33a98c612 set variable public didn't work / didn't work on server and headless client 2015-09-20 11:02:15 +02:00
commy2
8c8b23ec18 Merge pull request #2530 from acemod/commoncleanup6 
common code cleanup part 6
 2015-09-20 10:44:31 +02:00
commy2
dfa6d71a64 more common code cleanup 2015-09-20 00:55:58 +02:00
commy2
73a9c1b5f8 more common code cleanup 2015-09-19 23:18:07 +02:00
commy2
6b96c7fd7c more common code cleanup 2015-09-19 22:27:23 +02:00
commy2
bfd5d13de8 more common code cleanup 2015-09-19 21:33:25 +02:00
bux578
450ee98004 Merge pull request #2515 from acemod/340fixinventoryeh 
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
 2015-09-19 21:04:48 +02:00
commy2
09f133b7f8 more common code cleanup 2015-09-19 20:55:35 +02:00
commy2
3ddaa5ed4a more common code cleanup 2015-09-19 20:34:07 +02:00
commy2
1636e3976d more common code cleanup 2015-09-19 20:17:38 +02:00
commy2
cbc7f961b2 more common code cleanup 2015-09-19 19:40:56 +02:00
commy2
20a5c79431 more common code cleanup 2015-09-19 19:26:45 +02:00
commy2
fb71e0594e lsd module, use global variable for color 2015-09-19 18:47:00 +02:00
commy2
e08c6c343e fix LSD module, cutback on global variable usage 2015-09-19 09:24:28 +02:00
commy2
1357d72f16 fix broken LSD module 2015-09-19 02:44:02 +02:00
commy2
25d1e46422 Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:50:37 +02:00
commy2
c7d636a533 more common code cleanup 2015-09-19 01:50:17 +02:00
jokoho48
e7ff41a03c Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:12:20 +02:00
jokoho48
f2070deee8 Change spawn while to CBA PFH 2015-09-19 01:12:03 +02:00
commy2
f8ecf1b8ab fnc_debug was broken 2015-09-19 00:30:36 +02:00
commy2
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
commy2
85fd9d9d75 more common code cleanup 2015-09-18 21:46:21 +02:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
commy2
f3a175e9d6 remove obsolete private 2015-09-18 21:15:06 +02:00
commy2
5d0a7ed062 more common code cleanup 2015-09-18 21:12:40 +02:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
commy2
8704cd0321 fix additional bracket, formatting 2015-09-18 19:40:48 +02:00
commy2
a18f63d861 more common code cleanup 2015-09-18 19:12:38 +02:00
commy2
2674310e65 remove another deprecated function 2015-09-18 18:45:41 +02:00
commy2
1fd2fcafb0 remove old, not working functions 2015-09-18 18:34:29 +02:00
commy2
1b96caedc0 more common code cleanup 2015-09-18 18:28:19 +02:00
commy2
a8ba96a01b more common code cleanup 2015-09-18 16:41:00 +02:00
commy2
39786420fa more common cleanup 2015-09-18 16:33:53 +02:00
commy2
c0fdd80ba4 formating 2015-09-18 16:00:58 +02:00
commy2
7efcfcc8a0 more common cleanup 2015-09-18 15:40:51 +02:00
commy2
f83dea6e01 formatting, remove an obsolete private 2015-09-18 14:32:58 +02:00
commy2
b0704e486f more common cleanup 2015-09-18 13:09:40 +02:00
commy2
3a027ff26f more common cleanup 2015-09-18 09:38:19 +02:00
commy2
e833c3fc42 more common cleanup 2015-09-18 08:47:14 +02:00
commy2
fc82018c49 more common cleanup 2015-09-18 08:23:18 +02:00
commy2
df2c7dce78 replace old pushback macro 2015-09-18 07:53:36 +02:00
commy2
475c193060 common code cleanup part 2 2015-09-18 07:42:10 +02:00
commy2
37c1dbd6f7 Merge pull request #2490 from acemod/commoncleanup 
cleanup common
 2015-09-17 23:59:10 +02:00