Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fire component #8245

Merged
merged 5 commits into from
Oct 14, 2021
Merged

Conversation

TheCandianVendingMachine
Copy link
Contributor

@TheCandianVendingMachine TheCandianVendingMachine commented May 6, 2021

When merged this pull request will:

addons/fire/config.cpp Outdated Show resolved Hide resolved
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Jul 21, 2021
@PabstMirror PabstMirror added this to the Ongoing milestone Jul 21, 2021
@jonpas
Copy link
Member

jonpas commented Jul 23, 2021

Not ready for 3.14.0 @PabstMirror ?

@PabstMirror PabstMirror modified the milestones: Ongoing, 3.14.0 Jul 23, 2021
@PabstMirror
Copy link
Contributor

We've been using this for months
ace_fire_fnc_burn could maybe use a deep look-through sometime
but I'd say it's ready to merge and we can do any work on master

addons/fire/functions/fnc_medical_success.sqf Outdated Show resolved Hide resolved
addons/fire/functions/fnc_medical_canPatDown.sqf Outdated Show resolved Hide resolved
addons/fire/functions/fnc_fireManagerPFH.sqf Outdated Show resolved Hide resolved
addons/fire/functions/fnc_fireManagerPFH.sqf Outdated Show resolved Hide resolved
addons/fire/functions/fnc_burnIndicator.sqf Outdated Show resolved Hide resolved
addons/fire/CfgEventHandlers.hpp Outdated Show resolved Hide resolved
addons/fire/ACE_Medical_Treatment_Actions.hpp Outdated Show resolved Hide resolved
addons/fire/CfgEventHandlers.hpp Outdated Show resolved Hide resolved
addons/fire/$PBOPREFIX$ Outdated Show resolved Hide resolved
@@ -0,0 +1,19 @@
[
QGVAR(enabled), "CHECKBOX",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One is "enabled", the other (flare) is "enable". Not sure what we use most of the time (former I think), but both should be the same.

Settings are really the only thing I want double-checked before merge, so we can avoid changing them later if at all possible.

addons/fire/stringtable.xml Outdated Show resolved Hide resolved
addons/fire/stringtable.xml Outdated Show resolved Hide resolved
@severgun
Copy link
Contributor

Add thermal_burn damage type to medical_damage

Actually it is not.

@jonpas
Copy link
Member

jonpas commented Oct 12, 2021

Add thermal_burn damage type to medical_damage

Actually it is not.

Correct, that's in #7565.

addons/fire/initSettings.sqf Outdated Show resolved Hide resolved
addons/fire/stringtable.xml Outdated Show resolved Hide resolved
addons/fire/stringtable.xml Outdated Show resolved Hide resolved
addons/fire/functions/fnc_medical_success.sqf Outdated Show resolved Hide resolved
addons/fire/functions/fnc_medical_progress.sqf Outdated Show resolved Hide resolved
jonpas and others added 2 commits October 12, 2021 10:53
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>
jonpas added a commit to Theseus-Aegis/ACE3 that referenced this pull request Oct 13, 2021
@PabstMirror PabstMirror merged commit caca92f into acemod:master Oct 14, 2021
@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/enhancement Release Notes: **IMPROVED:** labels Oct 15, 2021
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
* merge fire

* Change required addons. Change getPos to getPosASL. Remove include

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>

* Update addons/fire/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants