6419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
alganthe	96bd47bfbf	doc pass 11 update ... - Updated - fonts (added description) - huntIR - maptools - medical system - mk6mortar - disposable framework - explosives framework - settings framework - information center by @jonpas	2015-08-16 15:28:33 +02:00
alganthe	a420bccb02	documentation pass 11 ... - Updated information center - Update mortar doc - Updated medical doc - Updated maptools doc - Updated huntIR doc - Added framework doc - disposables - explosives	2015-08-16 13:19:20 +02:00
PabstMirror	dc06927418	missing ;	2015-08-09 13:57:39 -05:00
PabstMirror	6755b8766a	Merge pull request #2085 from jokoho48/codeCleanupDisposable ... Code cleanup of Disposable module	2015-08-09 13:24:18 -05:00
Glowbal	2d7e057acd	Merge pull request #2088 from acemod/fixes-medical-menu ... Fixes for the medical menu	2015-08-09 20:14:20 +02:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	aa4840d860	fixes #2075 - menu doesn't show which bodypart is selected on Basic medical	2015-08-09 20:08:45 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
jokoho48	fab0eee5dd	corrected some small point	2015-08-09 15:28:11 +02:00
Glowbal	58fc69c2a6	Updated litter configuration. Closes #2002	2015-08-09 08:59:04 +02:00
jokoho48	b23f9c0de2	Code cleanup of Disposable module	2015-08-09 05:25:19 +02:00
PabstMirror	7624a459eb	Merge pull request #2010 from jokoho48/codeCleanupInteractMenu ... Code cleanup Interact_menu module	2015-08-08 21:35:54 -05:00
PabstMirror	95d88b920e	#2079 - RemoveTourniquet doesn't require any items	2015-08-08 21:25:36 -05:00
PabstMirror	5628ce1bcd	#2074 - Medical Menu Module not unique	2015-08-08 20:27:56 -05:00
PabstMirror	879826de8b	Merge pull request #2077 from jonpas/fixNametagsString ... Fixed incorrect string path in nametags	2015-08-08 19:58:52 -05:00
PabstMirror	c949daae1f	OptionMenu C->LStrings	2015-08-08 19:57:57 -05:00
jonpas	7d36d80072	Fixed incorrect string path in nametags	2015-08-09 01:23:20 +02:00
Glowbal	2b3c936e99	count should be a foreach	2015-08-09 00:41:43 +02:00
Glowbal	02fdbe6fc2	Merge pull request #2053 from acemod/require-surrender-captive ... Require surrender before arresting a unit	2015-08-09 00:26:05 +02:00
Glowbal	c7ac190f58	Finalized settings	2015-08-09 00:21:59 +02:00
Glowbal	54ad9d1444	Merge branch 'master' into require-surrender-captive	2015-08-08 23:21:00 +02:00
Glowbal	493254619c	Merge pull request #2039 from acemod/medical-menu ... Medical menu	2015-08-08 23:11:11 +02:00
Glowbal	f02a00ae69	Merge pull request #2058 from acemod/add-category-optionsmenu ... Add category optionsmenu #852	2015-08-08 22:59:19 +02:00
PabstMirror	d5a3c66b89	Minor Spelllings Fixes	2015-08-08 14:17:03 -05:00
PabstMirror	3664afcf90	search_privates.py: use new params command	2015-08-08 13:42:05 -05:00
Glowbal	c0562aaf6c	clean up debug messages	2015-08-08 20:31:19 +02:00
Glowbal	696546de5c	Finalized ACE medical menu settings	2015-08-08 20:22:19 +02:00
PabstMirror	c6be0bbb8c	Merge branch 'master' into add-category-optionsmenu ... Conflicts: addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf	2015-08-08 12:39:14 -05:00
PabstMirror	feceff2746	Polish the stringtable	2015-08-08 12:36:42 -05:00
PabstMirror	0719a3c1c6	Merge pull request #2055 from MikeMatrix/codeCleanupScopes ... Code cleanup Scopes module	2015-08-08 11:42:40 -05:00
Glowbal	4c7bcbb6fe	Added triage card display	2015-08-08 18:29:30 +02:00
PabstMirror	7fe6c2fe1b	Merge pull request #2063 from jonpas/fixMissingString ... Fixed missing string	2015-08-08 11:19:27 -05:00
PabstMirror	8e905af444	Merge pull request #1977 from acemod/attachClickCooldown ... Mouse cooldown for click to interact option	2015-08-08 11:18:20 -05:00
Glowbal	31a5f8899b	Changed default keybinding value to be H	2015-08-08 18:16:25 +02:00
PabstMirror	451c88c601	Merge pull request #2027 from acemod/joinGroupTeamManagement ... EnableTeamManagement setting for joinGroup	2015-08-08 11:16:20 -05:00
Glowbal	bb79feeaf1	Clean up duplicate files	2015-08-08 18:16:11 +02:00
jonpas	8e3a961ee3	Fixed missing string	2015-08-08 18:11:28 +02:00
PabstMirror	7c7fb35cee	Merge pull request #2036 from acemod/mapToolsOnOtherMaps ... MapTools work on children of itemMap	2015-08-08 11:10:32 -05:00
Glowbal	054ac3443d	Merge pull request #2062 from jonpas/removeDuplicatedStrings ... Removed duplicated strings	2015-08-08 18:04:44 +02:00
jonpas	1aecd54fc3	Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common	2015-08-08 18:02:20 +02:00
Glowbal	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	bd0593f8f4	fixed missing semi-column	2015-08-08 17:49:43 +02:00
Glowbal	be9726ba52	Merge pull request #1985 from acemod/hearingRingingModule ... Add Ear Ringing setting to module	2015-08-08 17:44:11 +02:00
Glowbal	12f0808784	Merge branch 'master' into hearingRingingModule ... Conflicts: addons/common/stringtable.xml	2015-08-08 17:42:18 +02:00
Glowbal	c69aa09d55	Merge pull request #2054 from MikeMatrix/codeCleanupSitting ... Code cleanup of Sitting module	2015-08-08 17:00:07 +02:00
Glowbal	9fc94eefd9	Merge pull request #2006 from jokoho48/codeCleanupWinddeflection ... Code cleanup Winddeflection module	2015-08-08 15:03:26 +02:00
Glowbal	a65495fb14	Merge pull request #2011 from jokoho48/codeCleanupBallistic ... Code cleanup Ballistics module.	2015-08-08 15:00:08 +02:00
Glowbal	ff421db3df	Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication ... Headdirection based wind indication	2015-08-08 14:51:37 +02:00
Glowbal	66f2dfa31e	Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect ... Updated function documentation of Weaponselect	2015-08-08 14:45:28 +02:00
Michael Braun	e4a4a942d0	Updated function documentation of Weaponselect	2015-08-08 14:40:23 +02:00