KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
alganthe
10296d2883
PAK and Surgical Kit strings normalized inside modules.
...
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-23 15:50:50 +02:00
bux578
95ec25736e
Merge pull request #2563 from gienkov/missing-strings
...
Missing english strings
2015-09-23 09:48:54 +02:00
Glowbal
3c5f222959
Merge branch 'release'
2015-09-22 22:22:39 +02:00
PabstMirror
3c9e1899e2
Merge pull request #2574 from acemod/fixClickExplosivePlace
...
Delay one frame when selecting explosives
2015-09-22 13:25:27 -05:00
PabstMirror
ebcc540943
Merge pull request #2572 from acemod/fixClickExplosivePlace
...
Delay one frame when selecting explosives
2015-09-22 13:23:33 -05:00
Glowbal
93e5429ed5
Add sqf validator script to travis configuration
2015-09-22 20:18:12 +02:00
PabstMirror
5add8d6789
#2537 - Delay one frame when selecting explosives
2015-09-22 11:31:58 -05:00
jonpas
a42685af2e
Removed copy/pasted maintainer intruder
2015-09-22 18:04:27 +02:00
Grzegorz
1848ea6325
fixez
2015-09-22 14:58:59 +02:00
[OMCB]kaban
49d1355ad8
Fix due to review
2015-09-22 11:52:06 +03:00
PabstMirror
cf8a7f742e
#2541 - Attach getIn/Out run on local unit
2015-09-21 22:50:48 -05:00
PabstMirror
f93538eb9a
#2423 - assign vehicle module fix for prefilled veh
2015-09-21 21:44:52 -05:00
PabstMirror
079d88ded7
Merge pull request #2509 from acemod/miscFixNilFunctions
...
Fix some nil functions
2015-09-21 20:36:09 -05:00
PabstMirror
bf0cdbaf77
Merge pull request #2534 from acemod/unconcHandcuffs
...
Take Unconscious captive
2015-09-21 20:35:02 -05:00
Grzegorz
55eae90484
tabz
2015-09-22 02:35:06 +02:00
gienkov
bbccfbaa35
pl medical string
2015-09-22 01:04:46 +02:00
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
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
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
Glowbal
b695a54655
Add a first implementation of the sqf validator/parser/linter.
...
Checks all sqf files within given module or entire project for missing [] {} or ()
Prints out information regarding anything it marks as a possible error
2015-09-21 18:01:45 +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
