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.

Sign up for GitHub

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

Jump to bottom

Overheating - Fix errors, improve documentation, change ACEX references for integration #8522

Merged
merged 11 commits into from
Oct 17, 2021
Merged

Overheating - Fix errors, improve documentation, change ACEX references for integration #8522

merged 11 commits into from
Oct 17, 2021

Conversation

Drofseh
Copy link
Contributor

@Drofseh Drofseh commented Oct 15, 2021 •
edited
Loading

When merged this pull request will:

LinkIsGrim
LinkIsGrim reviewed Oct 15, 2021
View reviewed changes
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

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

Just some grammar stuff.

docs/wiki/feature/overheating.md Outdated Show resolved Hide resolved
docs/wiki/feature/overheating.md Outdated Show resolved Hide resolved
docs/wiki/feature/overheating.md Show resolved Hide resolved
@jonpas jonpas added the kind/bug-fix Release Notes: **FIXED:** label Oct 15, 2021
@jonpas jonpas added this to the 3.14.0 milestone Oct 15, 2021
Drofseh and others added 4 commits October 15, 2021 08:46
@Drofseh @LinkIsGrim
Update docs/wiki/feature/overheating.md
f860ce9 
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
@Drofseh @LinkIsGrim
Update docs/wiki/feature/overheating.md
1238fcb 
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
@Drofseh
fix icon filepath for AceX integration
4373929
@Drofseh
Merge branch 'overheating-oopsies' of https://github.com/Drofseh/ACE3 …
b4421fa 
…into overheating-oopsies
@PabstMirror
Copy link
Contributor

check overheating postinit
acex_field_rations_helper doesn't exist anymore and it should be QEGVAR(field_rations,helper)

@Drofseh @PabstMirror
Apply suggestions from code review
75fc1f7 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@PabstMirror
Copy link
Contributor

https://github.com/acemod/ACE3/blob/master/addons/field_rations/XEH_postInit.sqf#L19
is QGVAR(waterSource)

https://github.com/acemod/ACE3/blob/master/addons/field_rations/XEH_postInit.sqf#L73
is QXGVAR(waterSource)

we really need to be careful mixing ace and acex
maybe we should maintain a list of all old acex_vars in the addon's readme.md

@mharis001
Copy link
Member

L73 should be QGVAR. I believe only public stuff needs the X family macros, which action names shouldn't fall under.

@jonpas
Copy link
Member

jonpas commented Oct 16, 2021

L73 should be QGVAR. I believe only public stuff needs the X family macros, which action names shouldn't fall under.

Correct.

Drofseh and others added 2 commits October 16, 2021 15:50
@Drofseh @mharis001
Update addons/overheating/XEH_postInit.sqf
d2f8939 
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
@Drofseh
move old AceX references to macros
8500443
@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 16, 2021 •
edited
Loading

Ok, I think I've got all the AceX stuff correctly converted now.
I've also made a PR #8540 to add some external reference macros for AceX stuff that are now used here

The only thing left should be a couple of isClass (configfile >> "CfgPatches" >> "acex_field_rations") checks, I don't think there is a macro for acex_field_rations at this time, and I don't think it really needs it.

@Drofseh Drofseh changed the title Overheating - Fix jam script error, improve documentation Overheating - Fix errors, improve documentation, change AceX references for integration Oct 17, 2021
@PabstMirror PabstMirror merged commit eadbc60 into acemod:master Oct 17, 2021
@jonpas jonpas changed the title Overheating - Fix errors, improve documentation, change AceX references for integration Overheating - Fix errors, improve documentation, change ACEX references for integration Oct 18, 2021
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
@Drofseh @LinkIsGrim
@PabstMirror @mharis001 @AndreasBrostrom
Overheating - Fix errors, improve documentation, change AceX referenc…
b4ce0cd 
…es for integration (acemod#8522)

* Fix jam script error, improve documentation

* formatting

* Update docs/wiki/feature/overheating.md

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* Update docs/wiki/feature/overheating.md

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* fix icon filepath for AceX integration

* Apply suggestions from code review

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

* Update addons/overheating/XEH_postInit.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* move old AceX references to macros

* small whitespace formatting

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim left review comments

@mharis001 mharis001 mharis001 left review comments

@xfunnypigx xfunnypigx xfunnypigx left review comments

@PabstMirror PabstMirror PabstMirror left review comments

@jonpas jonpas jonpas approved these changes

@rautamiekka rautamiekka rautamiekka left review comments

Assignees
No one assigned
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.14.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Drofseh @PabstMirror @mharis001 @jonpas @rautamiekka @xfunnypigx @LinkIsGrim