58 Commits

Author	SHA1	Message	Date
commy2	e7fa02d0d9	Merge pull request #3812 from acemod/cbaDelayedExecFnc ... Use new CBA delayed execution functions and deprecate ACE functions	2016-05-30 21:02:29 +02:00
bux578	b4cb49ffec	Merge pull request #3836 from acemod/fix_null_rallypoint ... fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:57:44 +02:00
commy2	bc6f756df4	fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:22:49 +02:00
commy2	1bd44e562a	replace a comma with semi colon	2016-05-29 11:44:00 +02:00
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
commy2	c5275813a4	use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 10:49:09 +02:00
Cuel	66c2bf0506	Fix dead bodies removal, when forced = 1 ... - Removed unused(?) GVAR(Module) - Removed "white space alignment" in module.sqf	2016-05-03 20:10:28 +02:00
commy2	8233661d55	remove unused non API functions	2016-02-24 09:39:39 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01: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	f0036fabbb	use BIS fnc for time format	2015-10-04 02:15:38 +02:00
commy2	38422e6586	fix missing magazines after certain scenarios	2015-10-04 01:26:38 +02:00
commy2	94eaeb38cc	move variable out of params	2015-10-01 21:34:40 +02:00
commy2	7f1f56c121	fix broken time format for rallypoints, fix #2662	2015-10-01 21:28:00 +02:00
commy2	6d9943ff2e	fix wrong macro, missing ;	2015-09-26 16:45:39 +02:00
commy2	b1fb7befe8	remove wrong isServer check	2015-09-26 16:32:29 +02:00
commy2	5425836e47	cleanup respawn module, close #2184	2015-09-26 16:28:18 +02:00
commy2	30ba4f5586	this append should've been pushBack	2015-09-18 23:34:49 +02:00
commy2	56f4cbb39e	fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-18 23:03:35 +02:00
Michael Braun	a5fb09a7e1	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/repair/functions/fnc_moduleRepairSettings.sqf	2015-09-09 02:55:12 +02:00
bux578	9e1ae58f4f	fix restore gear	2015-09-03 18:17:53 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
bux578	3d9b0d527c	fix indentation ... atom needed the editorconfig package	2015-08-15 18:58:31 +02:00
bux578	675cfc2da7	after respawn select last weapon, muzzle and mode ... #2138	2015-08-15 18:54:39 +02:00
PabstMirror	7eb26c8710	#1699 - Rally point object names	2015-07-01 01:27:06 -05:00
PabstMirror	4e8fc49b5e	Always remove fakeWeapon after adding ... Should fix #1500	2015-06-05 15:38:45 -05:00
jonpas	9fbf256acd	Merge branch 'master' into macroSTR ... Conflicts: addons/hearing/functions/fnc_putInEarplugs.sqf addons/interact_menu/ACE_Settings.hpp	2015-06-04 17:13:09 +02:00
bux578	ee85aab791	fix #1439	2015-06-04 14:30:38 +02:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
commy2	aabe532829	manual merge	2015-04-26 21:26:57 +02:00
commy2	9cb27c8fb2	fix: error when getting killed with FF-messages module, fix #745	2015-04-19 07:08:57 +02:00
PabstMirror	ed2e847247	More Privates	2015-04-17 18:13:09 -05:00
PabstMirror	dce344c85f	Ignore Case	2015-04-17 16:51:27 -05:00
commy2	d68cc8f40e	sync rallypoint marker on jip	2015-04-15 20:50:03 +02:00
commy2	18be5276a9	rally point moved eh, markers at rallypoint positions	2015-04-15 19:18:42 +02:00
commy2	bf8f9b4818	all I need is a $	2015-04-15 15:34:01 +02:00
commy2	6c4e50a98d	localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot	2015-04-15 08:31:40 +02:00
commy2	2940d1f83c	base rallypoints create a respawn marker if none is present in the mission	2015-04-15 03:10:17 +02:00
commy2	4cdf61ab9e	fix misc issues with rallypoints	2015-04-15 01:50:58 +02:00
Niko Lehtovirta	4b50d760e9	fixed to use proper 4-space tabbing	2015-04-11 20:36:38 +03:00
Niko Lehtovirta	9f2f660b89	fixed PFH to use EFUNC(common,waitAndExecute)	2015-04-10 16:23:27 +03:00
Niko Lehtovirta	f0468fa7c8	Changed spawn code on respawn to PFH format	2015-04-10 14:21:52 +03:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00
commy2	1b8a9290cd	remove obsolete custom eh from agm	2015-03-21 21:56:22 +01:00
Nicolás Badano	74d0ae95ff	Change ACE_Settings from modules	2015-02-03 02:53:02 -03:00
Nicolás Badano	8467013c1a	Moved getAllGear function to common module	2015-01-16 15:24:25 -03:00