Magnetar
|
bb2d1e4e9e
|
Merge branch 'master' into medical-rewrite
|
2019-03-17 17:39:43 +01: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 |
|
blaffer
|
7634f4657b
|
Fix #6234 (#6235)
|
2018-04-09 22:50:57 -05: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
|
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
|
c26008ad29
|
hitreactions - Close map on hit (#5099)
|
2017-05-10 11:29:26 -05:00 |
|
commy2
|
6ae57e991f
|
delete obsolete
|
2016-09-30 12:28:34 +02:00 |
|
PabstMirror
|
60a7490b7e
|
Fix some moved funcs/strings
|
2016-09-29 15:08:36 -05:00 |
|
jonpas
|
ccaec31a90
|
Use new QFUNC and QEFUNC macros
|
2016-04-08 20:43:26 +02:00 |
|
commy2
|
e56e18bff3
|
Code cleanup 1.54
|
2016-01-06 22:42:02 +01:00 |
|
commy2
|
028aa404e9
|
change description in function header
|
2015-09-26 21:27:00 +02:00 |
|
commy2
|
c12584e15c
|
Code Cleanup HitReactions
|
2015-09-26 21:23:18 +02:00 |
|
jokoho48
|
e890b310c1
|
Code cleanup of HitReaction module
|
2015-08-13 23:50:51 +02:00 |
|
PabstMirror
|
e2217220eb
|
HitReactions - Don't do when mounted, add setting
|
2015-05-31 16:16:14 -05:00 |
|
commy2
|
2d265ec6c2
|
prevent ai fro being stuck, #290
|
2015-04-09 16:54:50 +02:00 |
|
commy2
|
b41c6280ba
|
prvent falling ai from being stcuk, fix #290
|
2015-04-09 16:52:59 +02:00 |
|
commy2
|
9a0f0cb47b
|
stuff from medical
|
2015-03-26 16:58:41 +01:00 |
|
commy2
|
cf2b7d3bfb
|
private
|
2015-03-26 15:19:13 +01:00 |
|
commy2
|
20dd8f34fc
|
fall down after getting shot while moving
|
2015-03-26 15:06:51 +01:00 |
|