10225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Glowbal	10b7e5d270	Merge pull request #4107 from acemod/fixMainMenuAceOptionsPlacement ... Fix MainMenu Ace_Options Placement to top left	2016-07-14 01:39:18 +02:00
Glowbal	11a72431c2	Merge pull request #4099 from acemod/FixMinigunMags ... Add missing vanilla magazines to LMG_Minigun	2016-07-14 01:38:58 +02:00
Glowbal	078647c403	Merge pull request #4097 from acemod/fixApex3denLayout-cherry-pick ... Fix 3den attribute layout for 1.62, target release	2016-07-14 01:38:41 +02:00
Glowbal	9d14121a9e	Merge pull request #4096 from acemod/func-dogesture ... use a function to do gestures	2016-07-14 01:38:18 +02:00
Glowbal	53b42710d1	Merge pull request #4095 from acemod/blurScreenDoc ... Add description and example to blur screen function	2016-07-14 01:37:32 +02:00
PabstMirror	13e182a7a9	Fix MainMenu Ace_Options Placement to top left ... Stick ace_options button placement to top left so it doesn't interfere with apex singleplayer menu	2016-07-13 13:49:05 -05:00
commy2	cc76ac482a	add priority parameter to doGesture	2016-07-13 11:00:31 +02:00
commy2	404d5b49b4	add function to read vanilla keybinds	2016-07-13 10:40:28 +02:00
PabstMirror	981dc874a4	Add missing vanilla magazines to LMG_Minigun ... Fix #4098 Missing: "500Rnd_65x39_Belt" "500Rnd_65x39_Belt_Tracer_Red_Splash" "500Rnd_65x39_Belt_Tracer_Green_Splash" "500Rnd_65x39_Belt_Tracer_Yellow_Splash"	2016-07-12 13:17:29 -05:00
PabstMirror	0281bc8f3d	Fix 3den attribute layout for 1.62	2016-07-12 17:54:16 +02:00
commy2	ce72bfd07a	replace tabs with spaces	2016-07-12 16:28:36 +02:00
PabstMirror	a0aea441b4	Fix reload mutex with binocs or mounted ... Fix #4088	2016-07-12 16:22:27 +02:00
commy2	8a4514f8e7	use a function to do gestures	2016-07-12 16:16:01 +02:00
jonpas	845dca9ea5	Add description and example to blur screen function	2016-07-12 16:13:53 +02:00
Glowbal	de612d9613	Merge branch 'apex' into release	2016-07-11 20:59:34 +02:00
Glowbal	8e3ad9a032	Merge pull request #4083 from acemod/required-addons-apex-cherry-pick ... Required addons for APEX	2016-07-11 20:58:50 +02:00
Glowbal	0869cf96bd	required arma3 version 1.62. closes #4081	2016-07-11 19:27:40 +02:00
Glowbal	d0c30577af	Remove usage of setUnconscious	2016-07-11 19:18:40 +02:00
Glowbal	86c67d9e33	Merge branch 'apex' into release	2016-07-11 19:04:53 +02:00
Glowbal	d2a40f16da	Merge pull request #4084 from acemod/add-component-dependency ... Add ACE javelin as required addon dependency	2016-07-11 18:45:25 +02:00
commy2	17f848fba9	Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick ... enable gunbag for all non-machinegun primary weapons	2016-07-11 17:40:53 +02:00
Glowbal	35a6636ca3	Add ACE javelin as required addon dependency	2016-07-11 12:08:12 +02:00
commy2	25a3405d1f	required addons apex, close #4020	2016-07-11 12:01:47 +02:00
Glowbal	dbac1c6398	Merge branch 'apex' into release	2016-07-11 11:16:50 +02:00
Glowbal	02f08939f2	Merge pull request #4052 from acemod/fix4049 ... Mine detector optimization and cleanup	2016-07-11 11:16:16 +02:00
Glowbal	9b85bc3e29	v3.6.1	2016-07-11 11:15:36 +02:00
Nicolás Badano	aa01c0d940	Merge pull request #4078 from acemod/fixNavalMines ... Allow defusing naval mines	2016-07-11 00:40:13 +02:00
PabstMirror	74da791610	Proper fix for naval mines	2016-07-10 17:29:19 -05:00
PabstMirror	721bc205ef	Allow defusing naval mines ... Fix #4074 - Workaround for naval mines not working with deactivate - Add "isNotSwimming" exception to defuse progress bar	2016-07-10 13:49:06 -05:00
esteldunedain	9323314da5	Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049	2016-07-09 20:04:20 -03:00
esteldunedain	165bd4b3f8	Make volume consistent	2016-07-09 20:00:53 -03:00
commy2	d249132864	Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading ... Add reload mutex as canInteractWith condition	2016-07-09 21:03:55 +02:00
PabstMirror	3ac1525a3d	Add base icon	2016-07-09 12:11:58 -05:00
jonpas	55c7b9bfc4	Merge pull request #3997 from acemod/gogglesEffectsSetting ... Add goggle setting for level of effects	2016-07-09 18:48:22 +02:00
jonpas	d9d2302ab8	Merge pull request #4069 from acemod/addAsianStrings ... Add Korean and Japanese strings to tracker	2016-07-09 18:20:16 +02:00
jonpas	317c36e85c	Merge pull request #4061 from acemod/removegtgt ... Remove remaining >> signs from interaction menu	2016-07-09 18:17:39 +02:00
BaerMitUmlaut	0a46a83e02	Realistic names for APEX content (#4055) ... * Added realistic names for APEX content * Fix strings * Lowercase Polish colors	2016-07-09 18:14:08 +02:00
PabstMirror	ef38144d70	Merge pull request #4051 from acemod/simplifyNews ... Make ace news fit apex menu style	2016-07-08 15:46:54 -05:00
jonpas	1185375c90	Add Korean and Japanese strings to tracker	2016-07-08 20:00:12 +02:00
commy2	c55c0d5666	only use one waitUntilAndExecute at any time for reload mutex	2016-07-08 15:12:47 +02:00
esteldunedain	071201ea46	Remove the pistol cursor from the mine detector	2016-07-07 19:03:14 -03:00
commy2	35b93e0da9	Merge pull request #4065 from acemod/removeRedundantFnc ... Remove redundant getMagazineIndex compatibility function	2016-07-07 20:22:50 +02:00
jonpas	0220b57609	Remove redundant getMagazineIndex compatibility function	2016-07-07 20:16:03 +02:00
esteldunedain	2a36fec793	Make the detector AI compatible	2016-07-07 12:38:53 -03:00
commy2	be17b72cad	remove old 'gestures' reload mutex	2016-07-07 16:38:24 +02:00
commy2	6569de5332	add event handler for reload mutex	2016-07-07 16:35:07 +02:00
esteldunedain	6160fe076d	Add an event when a mine is detected to allow hooking into missions	2016-07-07 11:17:57 -03:00
esteldunedain	244bdb093d	Add clicks when activating/deactivating the detector	2016-07-07 11:17:09 -03:00
esteldunedain	7a25c53dd3	Switch say2D to playSound	2016-07-07 10:51:34 -03:00
commy2	2a84865302	add event handler for reload mutex	2016-07-07 15:47:37 +02:00