Commit Graph

25 Commits

Author SHA1 Message Date
lambdatiger
eedbb0b5bc Revert to 60a0dae, merge conflict wasn't resolved properly 2024-06-20 00:04:34 -05:00
johnb432
80417b114d
Advanced Fatigue - Move sway to common and add enable sway setting (#9872)
* Move sway from fatigue to common

* Added enable sway setting

* Update addons/common/stringtable.xml

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/common/stringtable.xml

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/common/stringtable.xml

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-24 14:28:14 -07:00
johnb432
b4eaa1e270
Advanced Fatigue - Disable sway when Advanced Fatigue is off (#9867)
Disabled sway when advanced fatigue is off
2024-03-21 20:24:49 +01:00
BrettMayson
1649422cbd
Medical Vitals - Add SPO2 (#9360)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-07 17:50:18 -03:00
johnb432
8ca5263f18
Common - Make FUNC(isModLoaded) case-insensitive (#9704)
* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update fnc_isModLoaded.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-31 17:45:01 -08:00
amsteadrayle
f0a6fc7b9d
Advanced Fatigue - Add settings to change sway factor with weapon rested/deployed (#9536)
Add setting to change sway factor with weapon rested/deployed
2023-10-19 19:25:19 -04:00
Grim
cc26f00df3
Common/Adv. Fatigue/Medical - Add unified sway calculation (#9226)
* fix adv fatigue sway interaction with medical

* change medical sway scaling

* move to common

* function header

* number tweaks

* baseline is always at least 1

* Add error msgs and warn if using old ACE_setCustomAimCoef

* Update addons/common/functions/fnc_addSwayFactor.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-02 18:09:19 -04:00
pterolatypus
4a3ad40c04
Adv Fatigue - Make stamina penalty for weapon raised/ready scale with weapon inertia (#8669)
* Stamina penalty for weapon raised/ready is scaled by weapon inertia

* Newline

* Tabs

my editor hates me

* Use format

* Improved item validation and caching
2023-06-27 19:40:07 +03:00
GhostIsSpooky
8d83982d86
Advanced Fatigue - Improve misc. code (#8800)
* add improvements from #8763

* review changes

* writing is hard

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* missing ;

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2022-03-08 21:41:56 -06:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
Michael Warr
ab3af34be4
Advanced Fatigue consumes SwayFactor setting again (#7680) 2020-05-07 11:31:46 -05: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
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
commy2
b651cc8093
delete duplicated code 2018-09-10 19:30:30 +02: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
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
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +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
e086a33e4d Hide advFatigue bar on map / spectator 2016-11-10 17:49:18 -06:00
commy2
673f3b4f9f implement arithmetic source for fatigue system (#4517) 2016-10-06 22:46:46 +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
PabstMirror
bbcc82acf6 Tweak fatgiue duty factors 2016-09-13 16:56:06 -05: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