7403 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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
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
jokoho48	e7ff41a03c	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:12:20 +02:00
jokoho48	f2070deee8	Change spawn while to CBA PFH	2015-09-19 01:12:03 +02:00
commy2	f8ecf1b8ab	fnc_debug was broken	2015-09-19 00:30:36 +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
commy2	85fd9d9d75	more common code cleanup	2015-09-18 21:46:21 +02:00
commy2	f3a175e9d6	remove obsolete private	2015-09-18 21:15:06 +02:00
commy2	5d0a7ed062	more common code cleanup	2015-09-18 21:12:40 +02:00
commy2	a53d158a89	Merge pull request #2501 from acemod/commoncleanup4 ... common code cleanup part 4	2015-09-18 19:54:04 +02:00
commy2	8704cd0321	fix additional bracket, formatting	2015-09-18 19:40:48 +02:00
PabstMirror	c21a5d6f08	Merge pull request #2496 from acemod/fixLockPick ... Fix for #2495	2015-09-18 12:28:51 -05:00
commy2	a18f63d861	more common code cleanup	2015-09-18 19:12:38 +02:00
commy2	2674310e65	remove another deprecated function	2015-09-18 18:45:41 +02:00
Nicolás Badano	17e8e5050f	Merge pull request #2504 from acemod/spanish-translation ... Spanish translation	2015-09-18 13:39:43 -03:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
commy2	1fd2fcafb0	remove old, not working functions	2015-09-18 18:34:29 +02:00
commy2	1b96caedc0	more common code cleanup	2015-09-18 18:28:19 +02:00
esteldunedain	3422f5a7f1	Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation ... Conflicts: addons/medical/stringtable.xml addons/repair/stringtable.xml	2015-09-18 13:20:22 -03:00
commy2	a8ba96a01b	more common code cleanup	2015-09-18 16:41:00 +02:00
commy2	39786420fa	more common cleanup	2015-09-18 16:33:53 +02:00
commy2	c0fdd80ba4	formating	2015-09-18 16:00:58 +02:00
commy2	4211d71a32	Merge pull request #2499 from acemod/commoncleanup3 ... common code cleanup part 3	2015-09-18 16:00:42 +02:00
commy2	7efcfcc8a0	more common cleanup	2015-09-18 15:40:51 +02:00
commy2	f83dea6e01	formatting, remove an obsolete private	2015-09-18 14:32:58 +02:00