Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,845 Commits 73 Branches 88 Tags 752 MiB
iron_dome
Commit Graph

132 Commits

Author SHA1 Message Date
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
PabstMirror
fa910a7fd8
Small med stuff (#7084) 
* Small med stuff

* update adv fatigue comment

* disable medical debug by default

* Fix tourniquet call to addToTriageCard
 2019-07-03 10:40:42 -05:00
C0kkie
f6b35a63ab Translations - German (#6920) 
* Add all missing german translations for the ace medical system

* RHS Compat - Add 2 round hellfire to pylon options (#6893)

* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon

* Fastroping - Add user setting to confirm cutting ropes (#6876)

* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml

* compatibility with CBA scripted 2d optics framework

* compatibility with CBA scripted 2d optics framework

* Bewusstlosstatus -> Bewusstlosigkeit

* Verblutungseffekt -> Blutungs effekt

* Aktivitere ACE Sanitäter Aktionen -> Aktiviere Sanitäter Aktionen

* Sanitätermenüs -> Sanitätsmenü

* kritsche -> kritische

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for advanced fatigue, ai, arsenal & ballistics

* Update addons/ai/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for ace cargo

* Add missing german translation for vehicles

* Add missing german translation for weaponselect

* Add missing german translations für ace repair

* Add missing german translations for ace quickmount

* Add missing german translations for ace explosives

* Add missing german translations for ace common

* Ace flashlight missing german translation

* Add missing german translations for ace scopes

* add missing translations for ace respawn

* Add missing german translations for ace overpressure

* ACE Nametags german translation

* .

* ace magazinerepack german translation

* ace interaktion german translations

* add missing german translation for ace interaction menu

* ACE Hearing german translations

* Update stringtable.xml

* Update stringtable.xml

* Missing german translation in ace dogtags

* Missing german translations ace hot

* ace pylons missing german translations

* ACE Cook off German Translations

* zeus german translations

* Fast roping german translations

* gforces german translations

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Map - Don't enable map light for parachutes (#6961)

* Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)

* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Common - Don't add UAV AI to localUnits array (#6951)

* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions

* Update stringtable.xml

* Nightvision german translations

* Update stringtable.xml

* remove non-stringtable stuff ???
 2019-06-08 10:35:42 -05:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933) 
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
 2019-06-03 10:31:46 -05:00
barman75
d684a8042e Russian translations (#7005) 
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
 2019-06-03 09:59:13 -05:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
Jakub Ochalski
91182482db Polish Translation (#6730) 
Did the missing parts of the Polish translation.
 2018-12-11 16:50:36 -06:00
PabstMirror
0104030666
Add param for settings that require restart (#6512) 2018-11-02 12:58:57 -05:00
Josuan Albin
4d5f2d0de2 French translation (#6644) 
* Add french strings for advanced fatigue, finger and rearm

* Add french strings for rearm, fix some of the old ones

* Add missing strings for ACE Nightvision

* Add missing strings for ACE Pylons

* Add missing string for ACE mk6 mortar

* Add / Fix french strings in ACE CookOff

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/pylons/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>
 2018-10-27 15:10:45 -05:00
Andrea Verano
5594b9cef1 Italian Translation Update (#6621) 
Added new strings in:
-Advanced fatigue
-Arsenal
-Ballistics
-Common
-Concertina wire
-Dogtags
-Explosives
-Maverick
-MicroDAGR
-Night vision
-Overpressure
-Realistic names
-Scopes
-Zeus

Fixed some strings in:
-Common
-Concertina wire
-Hitreactions
-HuntIR
-Inventory
-Laser
-Maverick
-Medical ai
-Missile guidance
-Realistic Names
-Spotting scope
-Switch Units
-Tactical ladder
-Tripod
 2018-10-08 20:49:37 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407) 
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
 2018-09-17 14:19:29 -05:00
commy2
05ad146ba3
restore 2018-09-10 19:31:26 +02:00
commy2
b651cc8093
delete duplicated code 2018-09-10 19:30:30 +02:00
commy2
e592717c30
make hide stamina setting make bar reappear when changed mid mission 2018-09-10 15:15:59 +02:00
Glowbal
e8f00fbe7c
Merge remote-tracking branch 'origin/master' into medical-rewrite 2018-07-18 20:42:41 +02:00
Dissyu
e5a15d200f Traditional Chinese update (#6408) 
Traditional Chinese update
 2018-06-27 14:16:11 -05:00
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