Commit Graph

266 Commits

Author SHA1 Message Date
Wakbub
79e3de623f Use STRING macros (#6576) 2019-12-07 22:40:44 +01:00
PabstMirror
29a0732b0c
Common - Network safe claim (#7258)
* Common - Network safe claim

* Update fnc_claimSafeServer.sqf
2019-12-07 15:18:50 -06:00
PabstMirror
edd5c44853
Medical - Improve loading/unloading of unconc patients (#7109)
* Medical - Improve loading/unloading of unconc patients

* Update fnc_loadPersonLocal.sqf

* Multi-line

* Formating

* Update fnc_loadUnit.sqf
2019-09-05 15:56:53 -05:00
PabstMirror
0fa8330833
Common - Handle changes to UAVControl command (multi seat) (#7161) 2019-09-03 19:05:45 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* 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

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* 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
2019-05-11 23:13:59 -05:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
Medical rewrite
2019-03-30 15:20:15 -05:00
commy2
6ac2906aba setMass method to disable collisions 2019-03-24 09:26:00 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
jonpas
4ff01967b6
Add Feature Camera Player EH and Handling (#6573)
* Switch to CBA Feature Camera handling

* Register ACE3's Feature Cameras

* Backwards compatiblity for old ace event

* Require CBA 3.9
2018-10-12 14:59:40 +02:00
mharis001
803d497d8a Improve checking of unit items (#6350)
* Add uniqueItems function

* Optimize dogtag children actions function

* Optimize getDetonators item search

* Store CfgWeapons lookup in getDetonators

* Update items to use new function

* Update items to use new function 2

* More optimization of uniqueItems function

* Update items to use new function 3
2018-09-17 14:03:28 -05:00
Glowbal
e8f00fbe7c
Merge remote-tracking branch 'origin/master' into medical-rewrite 2018-07-18 20:42:41 +02:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait (#6160) 2018-02-21 11:05:17 +01:00
commy2
32755e4e91
forget only different side 2018-01-02 16:26:13 +01:00
commy2
13e52b4410 make setHidden use forgetTarget 2017-12-29 02:48:20 +01:00
commy2
4db844e596 merge 2017-12-23 01:47:43 +01:00
PabstMirror
c2d6fa53d4
Remove enum warnings (#5931) 2017-12-19 12:13:38 -06:00
PabstMirror
be67cf0737
Transfer old client settings to CBA (#5882)
* Transfer old client settings to CBA

* Remove cleanup code
2017-12-10 12:13:17 -06:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear (#5876)
* Add note to enum script error

* Bump Arma/CBA versions

* req 1.78
2017-12-08 21:39:35 -06:00
PabstMirror
6a6b03eb57 Fix undefined var 2017-12-07 12:45:59 -06:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive 2017-12-07 19:11:09 +01:00
Dystopian
36b61fdb6e Block adv. throwing when player is busy (#5534)
* Add throw blocking status effect

* Add concertina_wire and tripod support

* Add launcher in hands support

* Disable effect sending more than once

* Fix EFUNC using, add trace

* Disable vanilla throw blocking

* Improve status handling

* Fix rearm status key
2017-12-07 11:26:21 -06:00
commy2
eba99f4707 only use for medical, keep setCaptive for captives 2017-12-06 17:22:07 +01:00
commy2
1890c71c65 replace usage of setCaptive with camouflageCoef trait 2017-12-06 16:55:01 +01: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
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
Josuan Albin
1ba330e853 Add toggle flashlight and NVG zeus modules (#4556)
* Add toggle flashlight and NVG modules

* Remove excessive spaces in moduleToggleNvg

* Fix indentation and typos to fit review

* Add an option to add gear, fix headers

* Change category to utility

* Add QOL improvement suggested by pabst

* Fix locality issues

* Remove locality check before enableFlashlight targetEvent

* Remove locality check before addWeaponItem targetEvent

* Add a player check in moduleToggleNVG, change modules category

* Add the same QOL in toggleNVG than in toggleFlashlight
2017-09-21 20:43:35 +02:00
PabstMirror
74fd0f507f Add EH for UAV control, Add Hellfire support (#5305)
* Add EH for UAV control, Add Hellfire support

* cycle guidance keybind

* Handle broken PlayerViewChanged

* humps

* UAV Self-interactions (#5379)

* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
2017-08-22 16:07:45 -05:00
PabstMirror
a67815d072 Disable damage on cars loaded as cargo (#5402) 2017-08-22 13:27:11 -05:00
Dystopian
dd3a66a643 Fix adv. throw key handling when reloading (#5336)
* Fix throw key handling when reloading

* Consider UGL reload to ace_common_isReloading var

* Fix if space, change private var assign

* Shorten UGL check
2017-07-10 21:44:02 +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
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
d93269304d Merge branch 'master' into medical-rewrite 2017-04-15 10:09:50 -05:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988)
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
2017-04-11 10:06:29 -05:00
jonpas
fd139abb42 Use setShotParents in Advanced Throwing (#5052)
* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)
2017-04-11 16:59:32 +02: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
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
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
PabstMirror
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -05:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
commy2
f76457f48f convert log macros to cba versions 2016-08-22 21:06:52 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
commy2
5a1b33a5da convert common to cba hashes 2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3 remove deprecated functions 2016-07-30 11:16:19 +02:00