931 Commits

Author	SHA1	Message	Date
Glowbal	8b3e5ac8e2	Added hasItems function	2015-02-22 18:38:06 +01:00
Glowbal	2b061e8de3	Added itemConsumed attribute	2015-02-22 18:34:59 +01:00
Glowbal	b05e09ccb8	Added advanced treatment actions	2015-02-22 18:33:46 +01:00
KoffeinFlummi	ca930a5717	Add basic treatments, rename onProgress	2015-02-22 17:45:46 +01:00
Glowbal	ab6bc998c2	Added canAccessMedicalEquipment check	2015-02-22 15:01:31 +01:00
Glowbal	82c181cd7c	Fixed header	2015-02-22 14:54:54 +01:00
Glowbal	5e0eb7323a	Added option to toggle between progressbar top and bottom	2015-02-22 14:38:48 +01:00
Glowbal	77666e8097	Added weapon resting state icon	2015-02-22 13:58:51 +01:00
Glowbal	dd51037c5e	Added support for image color	2015-02-22 13:44:17 +01:00
Glowbal	9d44ec18b8	Added a default text color setting	2015-02-22 13:35:05 +01:00
Glowbal	323d673eec	Removed deprecated config entries (DisplayMessage and DisplayInformation)	2015-02-22 13:20:17 +01:00
Glowbal	7f6a647b4d	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite	2015-02-22 12:26:19 +01:00
Glowbal	56dad70a9e	Removed redundant level checks	2015-02-22 12:26:08 +01:00
Kieran	c8bf9d2ce1	Changed 'impacted' to 'crushed' ... Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate	2015-02-22 21:25:28 +10:00
Kieran	7ea31f8b05	Added causes to contusions - ace_med_treatment.hpp ... Added vehiclecrash and falling to contusion causes. (As those two situations commonly do result in bruising)	2015-02-22 21:21:27 +10:00
Glowbal	14411a5ef0	Fixed weird fix for getNumber for Array bug in setSettingFromConfig.	2015-02-22 11:36:21 +01:00
Glowbal	1ed50bfe3e	Fixed font size	2015-02-22 11:35:52 +01:00
Glowbal	47e27d7be3	Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui	2015-02-22 11:19:46 +01:00
Glowbal	8393645df9	Changed position to be inline with the weapon selector UI element by default	2015-02-22 11:19:32 +01:00
Glowbal	a574487166	Added localization support for displayText	2015-02-22 11:19:10 +01:00
Glowbal	9f3a0fe8d4	Removed displayInfo and displayMessage functions.	2015-02-22 11:18:37 +01:00
Glowbal	9dc33c659d	Now takes selections into account	2015-02-22 10:56:46 +01:00
Glowbal	bdaec01112	Added medication overdose and wearoff.	2015-02-22 10:27:57 +01:00
Glowbal	fa2d0c6b06	Specified bleeding rate more accurately for subclasses	2015-02-22 09:40:36 +01:00
Glowbal	8e539bfb56	Added ability to use subclasses for injuries. ... Allows for usage of minor, medium and large injury variants.	2015-02-22 09:27:01 +01:00
PabstMirror	8945f99be1	Fix CurrentChannel ... GVAR -> FUNC onEachFrame exits when channel control is closed	2015-02-21 21:19:54 -06:00
PabstMirror	11be8f6f8f	Merge pull request #156 from KoffeinFlummi/nightVisionCleanup ... Night vision cleanup	2015-02-21 20:21:04 -06:00
Glowbal	e091ba1fd1	Added hasMedicalEnabled	2015-02-22 00:49:38 +01:00
Glowbal	e21046459e	Fixed location checking in treatment call	2015-02-22 00:47:14 +01:00
Glowbal	ab045e49c8	Fixed incorrect function calls for location	2015-02-22 00:45:58 +01:00
Glowbal	1781629c13	Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions.	2015-02-22 00:44:11 +01:00
Glowbal	b9213e8abc	Added use and has item functions for medical	2015-02-22 00:34:16 +01:00
Glowbal	c2b8e9031f	Increased the type and causes of injuries for advanced medical.	2015-02-22 00:25:07 +01:00
Glowbal	73c91af533	Added separate config parsing for basic and advanced	2015-02-22 00:24:50 +01:00
Glowbal	3f12af8b21	Added onTreatmentCompleted event calls	2015-02-21 23:17:20 +01:00
Glowbal	e5941e55fc	Added reactionToDamage and onTreatmentCompleted event	2015-02-21 23:14:21 +01:00
Glowbal	925aa094c7	Added place in bodybag function	2015-02-21 21:53:07 +01:00
Glowbal	46f28763b6	Added triage card and activity log	2015-02-21 21:47:10 +01:00
Glowbal	0d24ad5c0a	Removed outdated injury defines file	2015-02-21 21:33:07 +01:00
Glowbal	95ff4b151c	Added addHeartRateAdjustment function	2015-02-21 21:32:25 +01:00
Glowbal	72e2690b81	Fixed incorrect animation function call	2015-02-21 21:28:59 +01:00
Glowbal	909a87fdd3	Added tourniquet treatment functions	2015-02-21 21:26:39 +01:00
Glowbal	308e165cb6	Fixed headers	2015-02-21 21:25:37 +01:00
Nicolás Badano	6b7f649244	interact_menu: add headers	2015-02-21 17:11:03 -03:00
Glowbal	ead5f2ee79	Added new injury and treatment systems for advanced medical	2015-02-21 21:10:57 +01:00
Glowbal	b3e7431e67	Added new treatment framework	2015-02-21 21:09:57 +01:00
KoffeinFlummi	3482633fb1	Basic treatment structure	2015-02-20 22:04:01 +01:00
Nicolás Badano	908f23a78f	Removed filtering actions	2015-02-19 20:10:07 -03:00
PabstMirror	3511a74ef9	Don't show sound if not enabled	2015-02-19 16:59:21 -06:00
Nicolás Badano	dd92c5e845	Tap on either shoulder. "Tap" animation	2015-02-19 19:45:46 -03:00
PabstMirror	3ade628d87	Handle 3 Soundwave options	2015-02-19 16:42:28 -06:00
Nicolás Badano	bc3a226c64	Text under the icon	2015-02-19 18:56:43 -03:00
Nicolás Badano	41145e5731	reduce size of the menu	2015-02-19 18:03:25 -03:00
Nicolás Badano	0dfeb22ec8	tidy up	2015-02-19 18:03:14 -03:00
Glowbal	b58abaa2c0	Added a transparant background	2015-02-19 22:01:09 +01:00
Glowbal	ab6879845c	Merge branch 'master' into standardize_ui	2015-02-19 21:42:47 +01:00
Glowbal	a81c1fbef5	Overhauled AGM hint.	2015-02-19 21:38:51 +01:00
PabstMirror	a8e269bc18	Cleanup Escort Logic ... No more ERROR spam	2015-02-19 14:34:14 -06:00
Glowbal	2cf0ceff2a	Merge pull request #147 from KoffeinFlummi/common_cleanup ... Clean up of CSE code	2015-02-19 21:33:57 +01:00
PabstMirror	ae61dff44e	Move draw to function (wip)	2015-02-19 14:29:38 -06:00
Garth "L-H" de Wet	455d682706	Merge pull request #128 from KoffeinFlummi/IEDSupport ... IED support	2015-02-19 21:44:00 +02:00
Nicolás Badano	861a6b1775	avoid all submenus opening simultaneously by switching menu paths to use uids	2015-02-19 15:47:59 -03:00
Nicolás Badano	f7d5d615ee	allow actions to be defined for different selections	2015-02-19 15:36:27 -03:00
Glowbal	21199a4ee6	Now uses BIS_fnc_rscLayer	2015-02-19 19:32:49 +01:00
Glowbal	c8d4acfc81	Refactored displayText to no longer use spawn.	2015-02-19 19:29:54 +01:00
Glowbal	b0373de576	Tabs to spaces	2015-02-19 19:14:52 +01:00
Glowbal	612fa69c1c	Renamed string_removeWhiteSpace to stringRemoveWhiteSpace.	2015-02-19 19:12:14 +01:00
Glowbal	8488f10b92	Merge pull request #149 from KoffeinFlummi/cseMissionModules ... Port: CSE Ambiance sound module	2015-02-19 19:07:38 +01:00
Glowbal	af3709f481	Fixed forgotten missionModules.	2015-02-19 19:07:19 +01:00
Glowbal	1ea35548e0	Fixed ambiance sounds module.	2015-02-19 18:40:40 +01:00
Nicolás Badano	30943cbfd4	move the main menu actions to the right cuadrant	2015-02-19 12:03:20 -03:00
Nicolás Badano	a8797fe45a	Fix for the angular spacing of submenus	2015-02-19 12:02:48 -03:00
Nicolás Badano	db5e8bcc34	Modify the opacity of icons along with that of the text	2015-02-19 12:01:47 -03:00
Garth L-H de Wet	96404bc42a	Fixed isNull check not working. Fixed audio not being found.	2015-02-19 15:59:14 +02:00
Nicolás Badano	d055315661	interact_menu: tab to space	2015-02-19 10:49:36 -03:00
Nicolás Badano	53f632c716	Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu	2015-02-19 10:39:28 -03:00
Nicolás Badano	3b35d9d109	Make interact sub menus open as circle sectors instead of full circles	2015-02-19 10:38:09 -03:00
Nicolás Badano	8e6600d5ec	Tweak distances	2015-02-19 10:36:59 -03:00
Garth L-H de Wet	f5a6f6f404	Fixed various points raised in the PR.	2015-02-19 15:30:01 +02:00
Garth L-H de Wet	89a81dbed1	Forgotten function added.	2015-02-19 12:40:21 +02:00
Garth L-H de Wet	00643c3c83	Ensured actual fuse time is used instead of simply 1.	2015-02-19 12:39:13 +02:00
Garth L-H de Wet	8c83320675	Separated dialing phone code into separate function to neaten up the original function.	2015-02-19 12:32:41 +02:00
Garth L-H de Wet	e592f233f3	Merge branch 'master' into IEDSupport	2015-02-19 12:26:38 +02:00
PabstMirror	244d7a5572	Fix opacity fading on other render levels	2015-02-19 03:02:58 -06:00
Nicolás Badano	043987fc93	basic self actions	2015-02-18 18:58:06 -03:00
KoffeinFlummi	7e9a02089f	Merge branch 'medical-visuals' into medical-rewrite ... Conflicts: addons/medical/functions/fnc_handleDamage.sqf	2015-02-18 19:26:30 +01:00
KoffeinFlummi	3aae72aa70	Cleanup	2015-02-18 19:22:35 +01:00
KoffeinFlummi	58873e1c97	Pain Effect	2015-02-18 19:01:25 +01:00
PabstMirror	b86869d7a1	UAV-Recharge Headers	2015-02-17 22:37:04 -06:00
PabstMirror	c6c200a684	comments	2015-02-17 22:24:37 -06:00
PabstMirror	e649c8e853	Headers and formating	2015-02-17 22:07:29 -06:00
PabstMirror	c291f29702	Move model to folder	2015-02-17 22:06:37 -06:00
PabstMirror	c3b5430bc4	NVG KeyBinds	2015-02-17 22:05:52 -06:00
PabstMirror	37216d5144	Remove HandCuff animEH	2015-02-17 17:05:07 -06:00
Glowbal	bfc748fbbe	Added missionmodules.	2015-02-17 07:51:51 +01:00
Glowbal	d86e2464b3	Removed missionModules	2015-02-17 07:51:35 +01:00
Glowbal	d60081a9c3	Renamed missionModules to missionmodules.	2015-02-17 07:49:37 +01:00
PabstMirror	9cdf06383d	Back to getIn	2015-02-16 19:20:55 -06:00
PabstMirror	dc82e50d72	fix	2015-02-16 18:30:35 -06:00
PabstMirror	eee4b256cd	More Changes and add EH	2015-02-16 18:03:09 -06:00