Skip to content

Grenades - Code cleanup#9979

Merged
johnb432 merged 25 commits intomasterfrom
grenades-fixes
Jun 18, 2024
Merged

Grenades - Code cleanup#9979
johnb432 merged 25 commits intomasterfrom
grenades-fixes

Conversation

@johnb432
Copy link
Copy Markdown
Contributor

@johnb432 johnb432 commented Apr 27, 2024

When merged this pull request will:

  • Code cleanup.

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@johnb432 johnb432 added the kind/enhancement Release Notes: **IMPROVED:** label Apr 27, 2024
Comment thread addons/grenades/functions/fnc_flashbangExplosionEH.sqf Outdated
Comment thread addons/grenades/functions/fnc_incendiary.sqf Outdated
Comment thread addons/grenades/functions/fnc_incendiary.sqf Outdated
johnb432 and others added 4 commits April 28, 2024 01:25
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@johnb432 johnb432 changed the title Grenades - Improve multiple aspects Grenades - Code cleanup Apr 28, 2024
@johnb432 johnb432 marked this pull request as draft April 28, 2024 09:15
@johnb432 johnb432 marked this pull request as ready for review May 22, 2024 06:53
Comment thread addons/grenades/functions/fnc_nextMode.sqf Outdated
Comment thread addons/grenades/functions/fnc_throwGrenade.sqf Outdated
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Comment thread addons/grenades/functions/fnc_flashbangExplosionEH.sqf Outdated
Comment thread addons/grenades/functions/fnc_incendiary.sqf Outdated
@johnb432 johnb432 added this to the 3.18.0 milestone May 27, 2024
@johnb432 johnb432 merged commit 8fc093d into master Jun 18, 2024
@johnb432 johnb432 deleted the grenades-fixes branch June 18, 2024 08:05
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
* Improved various aspects of grenades

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update fnc_flashbangExplosionEH.sqf

* More cleanup

* Update fnc_incendiary.sqf

* Update fnc_incendiary.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update addons/grenades/functions/fnc_nextMode.sqf

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

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

* Update addons/grenades/functions/fnc_incendiary.sqf

* Removed fix that is included in another PR

* Update fnc_incendiary.sqf

* Messed up merge conflict resolution

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/enhancement Release Notes: **IMPROVED:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants