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
7,547 Commits 73 Branches 88 Tags 752 MiB
6c968d8bc7
Commit Graph

6229 Commits

Author SHA1 Message Date
commy2
24f0df55a2 Merge pull request #2559 from acemod/340disableuserinputcleanup 
Use CBA PFH in disableUserInput
 2015-09-22 00:52:58 +02:00
commy2
617b1ec78d Merge pull request #2556 from acemod/340deprecation 
add deprecated warnings
 2015-09-22 00:52:43 +02:00
gienkov
229ba1f758 Merge remote-tracking branch 'upstream/master' into missing-strings 2015-09-22 00:36:32 +02:00
gienkov
b05f0c62ff missing english respawn strings 2015-09-22 00:36:10 +02:00
PabstMirror
45e44251b6 Merge branch 'release' 
Conflicts:
	addons/repair/stringtable.xml
 2015-09-21 17:14:53 -05:00
PabstMirror
6702a1faa4 Fix warnings for WeaponHolderSimulated 2015-09-21 16:34:02 -05:00
commy2
23e3db9cc0 use CBA pfh in disableUserInput and fix key input weirdness 2015-09-21 22:42:31 +02:00
Glowbal
62ad9d4284 Version 3.3.2 2015-09-21 22:31:01 +02:00
Glowbal
42b2c18509 Merge pull request #2542 from acemod/FixSparePartsCargo 
Fix cargo setVariable on server with InitPost
 2015-09-21 22:28:59 +02:00
Glowbal
6b93760f9b Merge pull request #2557 from alganthe/torso_diag_fix 
Torso diag fix
 2015-09-21 22:27:13 +02:00
Glowbal
bbed98fbef Merge pull request #2394 from jonpas/cleanupRepairRelease 
Minor Repair Cleanup for release
 2015-09-21 22:25:58 +02:00
commy2
f1abd4698f remove superfluous ; 2015-09-21 22:12:17 +02:00
commy2
08a6da7ed5 Merge branch '340deprecation' of https://github.com/acemod/ACE3 into 340deprecation 2015-09-21 22:10:11 +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
PabstMirror
9996aa22ab Replace googles - isTurnedOut 2015-09-21 15:03:34 -05:00
commy2
a98e490f5c Merge pull request #2512 from acemod/340fixaidisposable 
fix ai seemingly reloading disposable launcher at mission start, fix #2508
 2015-09-21 22:00:55 +02:00
commy2
f8676afca4 use correct macro for rpt writing 2015-09-21 21:56:18 +02:00
commy2
020915a52a Revert "fix broken log warning macro" 
This reverts commit b1f79f0383.
 2015-09-21 21:51:05 +02:00
commy2
441efcd65f change version number in deprecated log 2015-09-21 21:48:18 +02:00
commy2
b1f79f0383 fix broken log warning macro 2015-09-21 21:39:45 +02:00
commy2
af309b937b add depracted warnings 2015-09-21 21:25:18 +02:00
commy2
a1b2d63417 Merge pull request #2551 from acemod/commoncleanup11 
common code cleanup part 11
 2015-09-21 21:12:42 +02:00
commy2
0070ba113c Merge pull request #2546 from acemod/overheatJamFFV 
Allow fixing jam when in FFV slot
 2015-09-21 19:51:14 +02:00
PabstMirror
1d5217d165 Medical - delayedUnconsicous fix waitAndExecute 2015-09-21 12:43:35 -05:00
commy2
5a5242f1c9 more common code cleanup 2015-09-21 19:19:49 +02:00
PabstMirror
4cc9b91d68 Merge pull request #2463 from acemod/cleanupNightvision 
Cleanup Nightvision
 2015-09-21 12:06:15 -05:00
PabstMirror
5a67b00540 Merge pull request #2507 from acemod/pythonSearchNilFuncs 
Script to search for undefined functions
 2015-09-21 12:05:27 -05:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51 more common code cleanup 2015-09-21 17:32:21 +02:00
commy2
13b487e13b fix missing ; 2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4 fix missing '' in info log macro 2015-09-21 17:09:10 +02:00
commy2
3037181fc2 more common code cleanup 2015-09-21 17:00:53 +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
ef099861a3 Merge pull request #2545 from acemod/commoncleanup9 
common code cleanup part 9
 2015-09-21 09:24:41 +02:00
bux578
9be4072a10 Merge pull request #2547 from gienkov/patch-34 
Add missing english string
 2015-09-21 08:44:31 +02:00
bux578
549a3e0a2a Merge pull request #2548 from gienkov/patch-35 
Add missing english string
 2015-09-21 08:44:16 +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
PabstMirror
5555eb195a Also search for missing stringtable entries 2015-09-20 17:46:43 -05:00
Grzegorz
89a1495534 Add missing english string 2015-09-21 00:42:08 +02:00
Grzegorz
29db26eb58 Add missing english string 2015-09-21 00:40:14 +02:00
Grzegorz
fe75aa55cf Add missing english string 2015-09-21 00:39:13 +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
PabstMirror
79d4eb62be Allow fixing jam when in FFV slot 2015-09-20 16:55:33 -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
86fae2c251 #2528 - addToLog date / missing string fullHeal 2015-09-20 13:19:51 -05:00
PabstMirror
0c8a694b96 Medical_menu settings under medical category 2015-09-20 12:07:44 -05: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
PabstMirror
9c61f256bc Rem debug 2015-09-20 10:06:24 -05:00
PabstMirror
789f3843d5 #2488 - Fix cargo setVariable on server with InitPost 2015-09-20 10:05:34 -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
alganthe
4265b11d51 wrong target fixed 
Signed-off-by: alganthe <alganthe@live.fr>
 2015-09-20 14:13:22 +02:00
Glowbal
461028b4e8 Merge pull request #2521 from acemod/fix-ctd-medical 
Fixed CTD on overpressure with advanced medical enabled
 2015-09-20 12:44:58 +02:00
Glowbal
8279f60d09 Merge pull request #2529 from acemod/repairCanInteractCheck 
Add CanInteractWith checks for repair
 2015-09-20 11:48:10 +02:00
Glowbal
409c2d5f78 Merge pull request #2505 from acemod/fixBFT 
Run BFT module on server
 2015-09-20 11:46:03 +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
PabstMirror
05f4dad764 maptools - Remove debug 2015-09-19 20:42:46 -05: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
PabstMirror
db41537f56 #2524 - Take Unconscious captive 2015-09-19 13:58:34 -05:00
commy2
09f133b7f8 more common code cleanup 2015-09-19 20:55:35 +02:00
SilentSpike
35d94e8d5c Fix medical litter scopeCurator values 
Solves #2526 where medical litter would appear in zeus with no name.
 2015-09-19 19:37:38 +01: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
6ee5c6d9f8 Merge pull request #2510 from acemod/commoncleanup5 
common code cleanup part 5
 2015-09-19 18:50:28 +02:00
commy2
fb71e0594e lsd module, use global variable for color 2015-09-19 18:47:00 +02:00
PabstMirror
8573238cff Merge branch 'release' 2015-09-19 11:21:33 -05:00
PabstMirror
3c93c2c95c #2525 - Add CanInteractWith checks for repair 2015-09-19 11:07:03 -05:00
PabstMirror
79d985a648 Fix XEH Warning Debug 
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
 2015-09-19 10:43:29 -05:00
PabstMirror
2e09a7aa4b "cherrypick" PR #2496 (lockpick) 2015-09-19 10:02:37 -05:00
Glowbal
1d7cbf40ca Fixed incorrect handleDamage call 2015-09-19 11:52:35 +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