488 Commits

Author	SHA1	Message	Date
PabstMirror	826b4fd20b	Cleanup	2015-11-06 20:53:05 -06:00
PabstMirror	e0506f29bc	Read settings from paramsArray (params in description.ext) ... for now just limited to SCALAR/BOOL	2015-11-06 20:46:06 -06:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
Joko	bd97c1ee96	fix Docu in waitUntilAndExecute	2015-11-02 12:05:43 +01:00
commy2	049d40b96e	change description in function header	2015-10-28 19:02:54 +01:00
commy2	a0bfcdd04c	Revert "rename hasHatch to canTurnOut, change description in function header" ... This reverts commit 932f09ce60.	2015-10-28 19:01:47 +01:00
commy2	932f09ce60	rename hasHatch to canTurnOut, change description in function header	2015-10-28 18:57:47 +01:00
commy2	643f4d36dc	add FUNC(hasHatch)	2015-10-28 08:01:25 +01:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +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	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