47 Commits

Author	SHA1	Message	Date
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
PabstMirror	0c8a694b96	Medical_menu settings under medical category	2015-09-20 12:07:44 -05:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	a5621604fd	Merge branch 'release' into czech	2015-09-10 20:51:33 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
jokoho48	c70c9cdee6	Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:49:23 +02:00
Glowbal	25a75b9f69	fixed incorrect macro usage	2015-09-05 12:35:48 +02:00
Glowbal	883b9ab545	Removed blur screen for medical menu #2069	2015-09-05 11:58:34 +02:00
Glowbal	85dc59d66c	Fixed: should only display "no injuries" when there are no injuries. Not the other way around	2015-09-05 11:57:41 +02:00
Glowbal	130569c485	Made basic medical bleeding information work with new damage system	2015-09-05 11:57:17 +02:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02:00
jokoho48	29cc4c2697	stringtable Cleanup	2015-08-22 22:50:36 +02:00
jokoho48	9d0f3c7f5b	stringtable Cleanup	2015-08-22 22:45:14 +02:00
jokoho48	4d81e4a99e	Code Cleanup Medical Menu Module.	2015-08-22 22:33:15 +02:00
gienkov	8f483ba8df	fix medical_menu stringtable error	2015-08-21 23:46:05 +02:00
Glowbal	bf8318530e	Merge pull request #2081 from acemod/close-med-menus-distance ... Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-21 14:20:41 +02:00
Glowbal	2f0ed4fba1	Merge pull request #2207 from jonpas/readmes ... Added and Updated README.md files	2015-08-21 14:07:30 +02:00
nsgundy	3aab62fa7c	Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain. ... Converted tabs to spaces	2015-08-19 15:32:46 -03:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
bux578	3b3d99fd60	fix gienkov's stuff	2015-08-12 18:46:56 +02:00
bux	3dc53ec492	replace <Original> with <English>	2015-08-12 10:25:37 +02:00
Michael Braun	58b697e292	Fixed missing space invalidating some xml parsers.	2015-08-12 10:06:45 +02:00
gienkov	49668a25f8	Merge remote-tracking branch 'origin/master' into pl-translation-5	2015-08-09 22:36:41 +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
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
PabstMirror	5628ce1bcd	#2074 - Medical Menu Module not unique	2015-08-08 20:27:56 -05:00
gienkov	ce99404200	move english strings from original to english, remove original	2015-08-09 01:52:22 +02:00
gienkov	1c0a6fb457	PL translation of common, medical_menu, optionsmenu	2015-08-09 01:47:55 +02:00
gienkov	6bd4fcc4fd	Fix stringtable error	2015-08-08 23:39:29 +02:00
Glowbal	696546de5c	Finalized ACE medical menu settings	2015-08-08 20:22:19 +02:00
Glowbal	4c7bcbb6fe	Added triage card display	2015-08-08 18:29:30 +02:00
Glowbal	31a5f8899b	Changed default keybinding value to be H	2015-08-08 18:16:25 +02:00
Glowbal	bb79feeaf1	Clean up duplicate files	2015-08-08 18:16:11 +02:00
Glowbal	cd5b5f1d24	clean up of the config	2015-08-07 20:15:09 +02:00
Glowbal	d7db2e159c	Split up into activity and quick view logs	2015-08-07 19:11:27 +02:00
Glowbal	471e8d27df	Fixed clean up	2015-08-07 19:11:10 +02:00
Michael Braun	5f313c75d5	Cleanup of medical_menu	2015-08-07 05:37:41 +02:00
Glowbal	9b380315e5	First working version of the medical menu	2015-08-06 23:51:17 +02:00
Glowbal	4dfef8025b	Medical menu port from CSE	2015-08-02 16:56:27 +02:00