115 Commits

Author	SHA1	Message	Date
maike1860	e3c5396593	Add Chinese translation Modify grammar (#6400) ... Translations- Chinese: Modify grammar	2018-06-22 19:14:11 -05:00
EtoileRei	a5a8c68831	Japanese Translation Tweak (#6375) ... - fixed typo - improved readability - standardized expression	2018-05-31 10:34:19 -05:00
BaerMitUmlaut	9aba78b320	Fix AF sway factor (#6360) ... * Fix sway factor, switch to CBA settings in AF * Add movedToSQF	2018-05-30 18:05:55 -05:00
commy2	e289acbb4e	Merge branch 'master' into adv_fatigue_sway_factor	2018-05-19 02:43:11 +02:00
commy2	d6a88ac34a	Merge pull request #5828 from xrufix/AimCoef ... Add ability to set aiming coefficient for mission scripting.	2018-05-16 07:53:09 +02:00
classic	2cd4615d5d	Update Japanese translations (#6340) ... * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation	2018-05-11 08:39:32 -05:00
John Lillis	d64a0c6728	Remove SwayFactor ACE setting and module addition	2018-02-18 11:09:49 -05:00
commy2	4db844e596	merge	2017-12-23 01:47:43 +01:00
PabstMirror	e6683e8077	Add slider settings (#5920) ... * Add slider settings * WARNING to INFO * tweak scopes / adv fatigue	2017-12-16 11:51:15 -06:00
rufix	7c4adee2e7	Prepare for merging with #5773.	2017-12-10 11:41:05 +01:00
rufix	8021ce4215	New function "setAimCoef" at common, change ace_advanced_fatigue_fnc_handleEffects to use new function instead of setCustomAimCoef	2017-11-29 18:09:05 +01:00
John Lillis	947b89d5aa	Update docs and stringtable.xml	2017-11-15 12:22:56 -05:00
John Lillis	36b7ac0623	Add swayFactor option to advanced fatigue	2017-11-15 12:16:15 -05:00
PabstMirror	cd30b09b4f	Convert ACE_settings to CBA_settings (#4895) ... * Convert ACE_settings to CBA_settings * Run Modules Globaly, BWC for SetSetting * Add support for string settings * ACE_ServerSettings warning * Add handler for global setting being changed * Add deprecated and replaced not to Settings Framework doc * Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu * Change modules scope to 1 * Disable debug	2017-11-11 20:21:55 +01:00
sbng-PAPA	a3e9879cec	korean translation (#5730) ... Misfit taxt Modified, translate for 3.11	2017-11-06 15:54:35 -06:00
PabstMirror	5c4dbdcbda	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/functions/fnc_adjustPainLevel.sqf addons/medical/functions/fnc_copyDeadBody.sqf addons/medical/functions/fnc_getTriageStatus.sqf addons/medical/functions/fnc_handleBandageOpening.sqf addons/medical/functions/fnc_handleCollisionDamage.sqf addons/medical/functions/fnc_handleDamage_fractures.sqf addons/medical/functions/fnc_handleDamage_woundsOld.sqf addons/medical/functions/fnc_init.sqf addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf addons/medical/functions/fnc_parseConfigForInjuries.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setHitPointDamage.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_unconsciousPFH.sqf addons/medical/stringtable.xml addons/medical_ai/functions/fnc_healUnit.sqf addons/medical_ai/functions/fnc_isInjured.sqf addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf	2017-10-24 16:13:12 -05:00
shukari	22c8ef1e8a	German stringtable updates (#5539) ... * advanced_fatigue stringtable german * cargo stringtable german * cookoff stringtable german * fastroping stringtable german * hellfire stringtable german * nlaw stringtable german * overpressure stringtable german * quickmount stringtable german * refuel stringtable german * repair stringtable german * scopes stringtable german * slideshow stringtable german * spectator stringtable german * zeus stringtable german * cookoff stringtable german #2 * hellfire stringtable german #2 * nlaw stringtable german #2 * overpressure stringtable german #2 * quickmount stringtable german#2 * refuel stringtable german #2 * scopes stringtable german #2 * slideshow stringtable german #2 * zeus stringtable german #2 * tiny fix * tiny fix * quickmount stringtable german #3 * fastroping stringtable german #2 * captives stringtable german * cargo stringtable german * cookoff stringtable german * tiny change * cargo stringtable german * fcs stringtable german * Fix german strings for scopes	2017-10-07 13:37:59 +02:00
classic	d5aeec11ea	Update the Jpn translation (#5586) ... * Update the Jpn translation few tweak to translation * Update the Jpn translation couple tweak * Update the Jpn translation added more simplify translation * Update the Jpn translation few tweak and fix miss translation * Update the Jpn translation Added missing symbol and few tweak * Update the Jpn translation added shortest word because text is protruding the button * Update the Jpn translation fix miss translation and some tweaks * Update the Jpn translation just few tweak * Update the Jpn translation fix miss translation * Update the Jpn translation just a little tweak * Update the Jpn translation just a tweak * Update the Jpn translation added more simply translation * Update the Jpn translation tweaked to some entry * Update the Jpn translation tweak to few entry * Update the Jpn translation fix for miss translation * Update the Jpn translation fix miss translation * Update the Jpn translation some tweaks to translation * Update the Jpn translation fix miss translation * fix the Jpn translation fix the kanji	2017-10-04 16:30:11 +02:00
PabstMirror	ddf72d5878	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/ACE_Medical_SelfActions.hpp addons/medical/CfgVehicles.hpp addons/medical/CfgWeapons.hpp addons/medical/data/model.cfg addons/medical/functions/fnc_treatment.sqf addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf addons/medical/stringtable.xml	2017-09-23 11:25:58 -05:00
Andrea Verano	e47212ea9c	Italian translation update (#5531) ... Added: -Advanced Fatigue -Interactions -Medical -Refuel -Spectator -Fully translated markers and maverick Fixed: -Next Unit -Previous Unit	2017-09-19 16:22:11 +02:00
classic	8b7a862611	Update the Jpn translate fd48c7f (#5381) ... * Update the Jpn translation Support to new entry * Update the Jpn translation for more Natural words. * Update the Jpn translation Unification of words. * Update the Jpn translation tweaks to words. * Update the Jpn translation Fix to wrong translation. * Update the Jpn translation added translation to Proper noun * Update to Jpn translation Fix to wrong translation.	2017-07-23 14:27:50 +02:00
Dissyu	a7954368f4	Fix Chinese content & missing string (#5375) ... * Fix missing string with stringtable Fix Advanced Fatigue & QuickMount * Fix Chinese content & missing string * Fix Gestures & DAGR missing string * Fix quickmount string with vanilla string * Remove adr97 unnecessary string	2017-07-19 20:57:20 +02:00
jonpas	5cf7569711	Correct new Chinese stringtable identifiers (#5334)	2017-07-08 09:48:39 -05:00
GodofMonkeys	60131ee589	Add Chinese Traditional & Simplified Localization (#5295) ... Add Chinese Traditional & Simplified Localization	2017-06-22 16:46:00 +02:00
PabstMirror	356a8f640a	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionRemoveTourniquet.sqf addons/medical/functions/fnc_addHeartRateAdjustment.sqf addons/medical/functions/fnc_addToInjuredCollection.sqf addons/medical/functions/fnc_addUnconsciousCondition.sqf addons/medical/functions/fnc_addVitalLoop.sqf addons/medical/functions/fnc_canTreat.sqf addons/medical/functions/fnc_copyDeadBody.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_determineIfFatal.sqf addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_getBloodPressure.sqf addons/medical/functions/fnc_getBloodVolumeChange.sqf addons/medical/functions/fnc_getCardiacOutput.sqf addons/medical/functions/fnc_getHeartRateChange.sqf addons/medical/functions/fnc_getTriageStatus.sqf addons/medical/functions/fnc_getUnconsciousCondition.sqf addons/medical/functions/fnc_handleBandageOpening.sqf addons/medical/functions/fnc_handleCollisionDamage.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_fractures.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_handleDamage_woundsOld.sqf addons/medical/functions/fnc_hasMedicalEnabled.sqf addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf addons/medical/functions/fnc_isInStableCondition.sqf addons/medical/functions/fnc_isMedicalVehicle.sqf addons/medical/functions/fnc_itemCheck.sqf addons/medical/functions/fnc_medicationEffectLoop.sqf addons/medical/functions/fnc_modifyMedicalAction.sqf addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf addons/medical/functions/fnc_moduleReviveSettings.sqf addons/medical/functions/fnc_parseConfigForInjuries.sqf addons/medical/functions/fnc_playInjuredSound.sqf addons/medical/functions/fnc_reviveStateLoop.sqf addons/medical/functions/fnc_selectionNameToNumber.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setHitPointDamage.sqf addons/medical/functions/fnc_setStructuralDamage.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatment.sqf addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_medication.sqf addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentBasic_morphine.sqf addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf addons/medical/functions/fnc_treatmentTourniquet.sqf addons/medical/functions/fnc_treatmentTourniquetLocal.sqf addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf addons/medical/functions/fnc_unconsciousPFH.sqf addons/medical/functions/fnc_useItem.sqf addons/medical/functions/fnc_vitalLoop.sqf addons/medical_blood/functions/fnc_hit.sqf addons/medical_treatment/functions/fnc_hasItem.sqf addons/medical_treatment/functions/fnc_useItems.sqf	2017-06-10 10:21:18 -05:00
Phyma	ffaa195fe5	Conform function headers to coding guidelines (#5255) ... * Fixed headers to work with silentspike python script * Fixed rest of the files * Fixed ace-team	2017-06-08 15:31:51 +02:00
PabstMirror	114f402c58	Merge branch 'master' into medical-rewrite	2017-05-23 13:44:57 -05:00
Andrea Verano	e3fd1612e2	Italian translation (Add & Fix) (#5193) ... Added Italian translation for: -advanced fatigue -advanced throwing -cook off -dogtags -gunbag -ui-scopes and much more... Fixed a lot of grammatical errors	2017-05-23 13:44:17 -05:00
PabstMirror	1aebae32c5	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf	2017-05-14 14:50:36 -05:00
PabstMirror	bfd3695868	SQF Lint Cleanup Pass (#5157) ... * SQF Lint Cleanup Pass * Fix var in TRACE * Add basic python tool * Simplify * Hit space key 6 times * Fix error in dropNozzle * handle error message exceptions * Fix py	2017-05-14 14:48:05 -05:00
PabstMirror	e3af1b55a5	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-03-18 09:56:42 -05:00
PabstMirror	672be73bae	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/XEH_preInit.sqf	2017-03-18 09:09:45 -05:00
PabstMirror	1208e441ac	Fix unarmed sprint->prone + minor perf improvments (#4887)	2017-03-15 10:12:07 -05:00
PabstMirror	97ec22bd9a	Switch heartbeat to waitAndExec, allow switching pain settings	2017-02-18 22:11:40 -06:00
PabstMirror	c7b60d1777	Merge branch 'master' into medical-rewrite	2017-02-18 18:17:37 -06:00
NorXAengell	1be278fbda	French translation to "Advanced throwing" and "Advanced fatigue" (#4415) ... * French translation of "Advanced fatigue" and "Advanced throwing" Full translation of "Advanced fatigue" and "Advanced throwing". * New batch of translation/correction	2017-02-11 15:16:56 -06:00
PabstMirror	159e762576	Handle changes to CBA_fnc_addPlayerEventHandler (#4878) ... * Handle changes to CBA_fnc_addPlayerEventHandler * Fix var spelling	2017-02-10 13:03:12 -06:00
PabstMirror	a32478adfb	Merge branch 'master' into medical-rewrite	2017-01-17 13:10:18 -06:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
commy2	a83267b2ff	manual merge	2016-12-05 20:15:16 +01:00
PabstMirror	bc89a260ff	AF - Remove setVar when removing eh	2016-11-27 16:38:33 -06:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699)	2016-11-23 13:35:25 -06:00
BaerMitUmlaut	1d8030d196	Tweaked fatigue in water	2016-11-14 21:55:26 +01:00
BaerMitUmlaut	e4a4d8f56d	Tweaked prone animation duty	2016-11-14 21:54:51 +01:00
BaerMitUmlaut	a4c6daef50	Fix AF for adjusted stances, fixes #4591	2016-11-14 19:24:21 +01:00
PabstMirror	6f640ddc45	spaces	2016-11-13 10:56:45 -06:00
PabstMirror	b3e313f52b	Use vehicle eh to hide bar	2016-11-13 10:55:57 -06:00
PabstMirror	26ae3b8075	Hide bar when mounted	2016-11-12 15:51:44 -06:00
PabstMirror	e086a33e4d	Hide advFatigue bar on map / spectator	2016-11-10 17:49:18 -06:00
commy2	576a63c27e	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-20 13:56:56 +02:00
PabstMirror	fe35e64696	Reset animation speed when not swimming (#4546)	2016-10-15 11:41:03 +02:00
commy2	0f43829b63	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-10 14:29:50 +02:00
commy2	4c96278bb4	fix fatigue when diving while sprinting, fix #4481	2016-10-08 12:44:37 +02:00
commy2	673f3b4f9f	implement arithmetic source for fatigue system (#4517)	2016-10-06 22:46:46 +02:00
commy2	05d30c5573	convert log macros to cba versions (#4282) ... * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
commy2	5da11d5f79	remove obsolete macro	2016-10-02 12:17:48 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
PabstMirror	0b3d38a72f	Use waitAndExecute for fatigue loop (#4453) ... * Use waitAndExecute for fatigue loop Close #4379 - Will use CBA_missionTime so it repsects pause and time accl - Possible performance improvment over using a PFEH * Rename main loop function	2016-09-23 16:40:52 -05:00
Grzegorz	a63dcb49d0	PL Translation 3.7.1 (#4395) ... * translate advanced fatigue * translate advanced throwing * translate cargo * translate chemlights * translate cookoff * translate explosives * translate fastroping * translate gforce * translate googles * translate grenades * translate gunbag * translate maptools * translate medical * translate medical_ai * translate minedetector * translate nametags * translate overheating * translate repair * translate tagging * translate ui * translate zeus	2016-09-18 22:00:13 +02:00
classicarma	892af25bac	translate advanced_fatigue	2016-09-17 00:56:13 +09:00
PabstMirror	bbcc82acf6	Tweak fatgiue duty factors	2016-09-13 16:56:06 -05:00
PabstMirror	9844ae32c9	Exit fatiuge loop when dead (don't play breathing sound)	2016-09-11 22:03:20 -05:00
PabstMirror	7055b242e4	Fix AF author String (#4330)	2016-09-04 22:34:48 +02:00
Glowbal	5034dffec8	Fix build error with make	2016-09-04 21:51:13 +02:00
BaerMitUmlaut	cc414de8d1	Add Advanced Fatigue component (#4321) ... * Initial commit advanced fatigue * Added animation changes * Fixes, rewrites * Broadcast 3den attribute and fix UBC * Further animation tweaks * Added Eden attribute and CBA settings * Switch to CBA events * Add beautified component name * Rewrites, fixes, tweaks * Move setVars to GVARs * Add setting to disable * Switch to status effect handler for sprint and jog blocking * Add component name * Failsafe for early unit player EH * Removed raised weapon penalty for pistols * Added respawn compatibility * Tweaked side jog animation speed * Added support for virtual load * Added stamina bar * Remove debug flags * Added custom duty factor functions and values * Added structural comments * Disabled CBA settings, added ACE settings * Fixed config * Added readme * Remove leftover debug diag_logs * Improved stringtable	2016-09-04 21:33:07 +02:00