7705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	5907bccc77	Merge pull request #2539 from acemod/commoncleanup8 ... common code cleanup part 8	2015-09-20 21:23:54 +02:00
commy2	2348c25e1a	more common code cleanup	2015-09-20 20:25:25 +02:00
PabstMirror	86fae2c251	#2528 - addToLog date / missing string fullHeal	2015-09-20 13:19:51 -05:00
PabstMirror	0c8a694b96	Medical_menu settings under medical category	2015-09-20 12:07:44 -05: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
Alessandro Foresi	aabc437314	Remove: pain diagnosis on dead patients	2015-09-20 17:37:33 +02:00
PabstMirror	9c61f256bc	Rem debug	2015-09-20 10:06:24 -05:00
PabstMirror	789f3843d5	#2488 - Fix cargo setVariable on server with InitPost	2015-09-20 10:05:34 -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
alganthe	4265b11d51	wrong target fixed ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-20 14:13:22 +02:00
Glowbal	461028b4e8	Merge pull request #2521 from acemod/fix-ctd-medical ... Fixed CTD on overpressure with advanced medical enabled	2015-09-20 12:44:58 +02:00
Glowbal	8279f60d09	Merge pull request #2529 from acemod/repairCanInteractCheck ... Add CanInteractWith checks for repair	2015-09-20 11:48:10 +02:00
Glowbal	409c2d5f78	Merge pull request #2505 from acemod/fixBFT ... Run BFT module on server	2015-09-20 11:46:03 +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
PabstMirror	05f4dad764	maptools - Remove debug	2015-09-19 20:42:46 -05: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
PabstMirror	db41537f56	#2524 - Take Unconscious captive	2015-09-19 13:58:34 -05:00
commy2	09f133b7f8	more common code cleanup	2015-09-19 20:55:35 +02:00
SilentSpike	b21a0d9f70	Merge pull request #2533 from acemod/scopeCuratorTweaks ... Fix medical litter scopeCurator values	2015-09-19 19:39:41 +01:00
SilentSpike	35d94e8d5c	Fix medical litter scopeCurator values ... Solves #2526 where medical litter would appear in zeus with no name.	2015-09-19 19:37:38 +01:00
commy2	3ddaa5ed4a	more common code cleanup	2015-09-19 20:34:07 +02:00
commy2	1636e3976d	more common code cleanup	2015-09-19 20:17:38 +02:00
commy2	cbc7f961b2	more common code cleanup	2015-09-19 19:40:56 +02:00
commy2	20a5c79431	more common code cleanup	2015-09-19 19:26:45 +02:00
commy2	6ee5c6d9f8	Merge pull request #2510 from acemod/commoncleanup5 ... common code cleanup part 5	2015-09-19 18:50:28 +02:00
commy2	fb71e0594e	lsd module, use global variable for color	2015-09-19 18:47:00 +02:00
PabstMirror	8573238cff	Merge branch 'release'	2015-09-19 11:21:33 -05:00
PabstMirror	3c93c2c95c	#2525 - Add CanInteractWith checks for repair	2015-09-19 11:07:03 -05:00
PabstMirror	79d985a648	Fix XEH Warning Debug ... Wait 5 to let supMon run first, and only show visual error if actually missing pbo.	2015-09-19 10:43:29 -05:00
PabstMirror	2e09a7aa4b	"cherrypick" PR #2496 (lockpick)	2015-09-19 10:02:37 -05:00
Glowbal	1d7cbf40ca	Fixed incorrect handleDamage call	2015-09-19 11:52:35 +02:00
Glowbal	3d18880714	New build of the medical extension	2015-09-19 11:51:57 +02:00
Glowbal	0c25f9d8fb	Added error handling and debug printing to the medical extension	2015-09-19 11:51:41 +02:00
commy2	e08c6c343e	fix LSD module, cutback on global variable usage	2015-09-19 09:24:28 +02:00
commy2	1357d72f16	fix broken LSD module	2015-09-19 02:44:02 +02:00
commy2	25d1e46422	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:50:37 +02:00
commy2	c7d636a533	more common code cleanup	2015-09-19 01:50:17 +02:00