Magnetar
|
bb2d1e4e9e
|
Merge branch 'master' into medical-rewrite
|
2019-03-17 17:39:43 +01:00 |
|
Dedmen Miller
|
564fc8aa99
|
Trivial code fixes (#6858)
|
2019-03-10 21:42:08 -05: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 |
|
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
|
f98b268419
|
Split setUnconscious func, add spontaneousWakeUpChance setting (#5114)
|
2017-06-05 11:42:46 -05:00 |
|
PabstMirror
|
b8a6a602f3
|
Disable g-forces for UAV AI (#5094)
|
2017-05-12 13:12:17 -05:00 |
|
PabstMirror
|
d313d53b02
|
Fix gforce avg on switching to aircraft (#4955)
* Fix gforce avg on switching to aircraft
* Dont use for-loop for neutral g-forces array
|
2017-03-09 16:49:50 -06:00 |
|
jonpas
|
03e923aa68
|
Cleanup Function Headers titles
|
2016-06-18 11:50:41 +02:00 |
|
commy2
|
da70854568
|
manual merge
|
2016-05-18 11:48:27 +02:00 |
|
PabstMirror
|
236ad912af
|
Gforces - Add ace_setting to only run in aircraft
|
2016-04-19 12:59:41 -05:00 |
|
commy2
|
467075ad67
|
replace timePFH with CBA_missionTime
|
2016-03-02 11:01:39 +01:00 |
|
esteldunedain
|
f599542b8e
|
gforces cleanup. Close #2130
|
2016-01-19 00:18:01 -03:00 |
|
VKing
|
069169cc72
|
Changed ACE_time back to time in comments where appropriate
|
2015-10-21 22:52:21 +02:00 |
|
PabstMirror
|
5f0d73bab6
|
Cleanup more stuff
|
2015-09-18 14:24:20 -05:00 |
|
jokoho48
|
b7e02da1cc
|
remove if (!hasInterface) from PFH
move ! in ()
|
2015-09-11 16:58:26 +02:00 |
|
jokoho48
|
defbdf1b1a
|
fix that HC throw a issue if PPEffect was used/applyed
|
2015-09-09 17:05:48 +02:00 |
|
jaynus
|
c924baefd7
|
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
|
2015-05-21 09:42:44 -07:00 |
|
PabstMirror
|
00f26144ec
|
More Privates
|
2015-04-17 15:45:00 -05:00 |
|
Glowbal
|
c6c04442c1
|
GForces now uses correct unconscious function
|
2015-04-02 22:54:39 +02:00 |
|
Nicolás Badano
|
5e79970740
|
Switching nicknames
|
2015-03-24 01:18:00 -03:00 |
|
Nicolás Badano
|
a2b1cf1259
|
g-forces: updated headers
|
2015-02-08 19:58:41 -03:00 |
|
PabstMirror
|
01ee35d6c5
|
Geforces: Fix "Error Zero divisor"
Adds some simple checks before dividing.
Before dropping uniform or playing as a dog would throw script error.
|
2015-02-01 13:09:17 -06:00 |
|
Nicolás Badano
|
60fa6dfbe6
|
gforces: fixed prefix for config entries
|
2015-01-27 19:25:37 -03:00 |
|
Nicolás Badano
|
3fa6f1b0c9
|
gforces: fix for when there's no player
|
2015-01-17 15:18:11 -03:00 |
|
Nicolás Badano
|
402156aecf
|
gforces: renamed function
|
2015-01-17 01:09:12 -03:00 |
|
Nicolás Badano
|
43b87cda0b
|
gforces: tweaked based on pilot feedback (https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573)
|
2015-01-17 00:59:45 -03:00 |
|
Nicolás Badano
|
f594198eae
|
gforces: port from AGM
|
2015-01-16 23:01:41 -03:00 |
|