458 Commits

Author	SHA1	Message	Date
commy2	040a63bd8f	Merge pull request #2254 from acemod/waitUntilAndExecute ... Add WaitUntilAndExecute Function	2015-10-04 11:45:54 +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
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
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
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
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	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
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
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
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
commy2	09f133b7f8	more common code cleanup	2015-09-19 20:55:35 +02:00
commy2	3ddaa5ed4a	more common code cleanup	2015-09-19 20:34:07 +02:00