Skip to content

State Machine - Add Hypothermia Impacts to Cardiac Arrest Timer #713

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
Open
mazinskihenry wants to merge 31 commits into
base: dev-Tomcat
Choose a base branch
from
Open

State Machine - Add Hypothermia Impacts to Cardiac Arrest Timer #713

mazinskihenry wants to merge 31 commits into from

Conversation

@mazinskihenry
Copy link
Contributor

@mazinskihenry mazinskihenry commented Jan 20, 2025 •
edited
Loading

When merged this pull request will:

  • Title

Do not merge before #686

IMPORTANT

  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

mazinskihenry and others added 30 commits January 11, 2025 01:36
@mazinskihenry
Start
b312e6b
@mazinskihenry
Working?
2360b79
@mazinskihenry
Pulling hairs
0bf1fef
@mazinskihenry
Ticket/Lib Supply Conversion
aa72614
@mazinskihenry
Extension
010fd88
@mazinskihenry
Diag_log remove
f89b676
@mazinskihenry
Mechanics
234172d
@mazinskihenry
Update stringtable.xml
8dd8144
@mazinskihenry
Headers
6f2b196
@mazinskihenry
Update fnc_handleUnitVitals.sqf
f411965
@mazinskihenry
Errors
a0d0d73
@mazinskihenry
Merge branch 'Role_Two' of https://github.com/mazinskihenry/KAM into …
218b85e 
…Role_Two
@mazinskihenry
Update stringtable.xml
4fb4d00
@mazinskihenry
Update fnc_handleUnitVitals.sqf
c99d9f1
@mazinskihenry
One Life Conversion
5d8768e
@mazinskihenry
Redo Config
c2bdda8
@mazinskihenry
Its broken again
846f3fc
@mazinskihenry
Update fnc_KATConditionExecutionDeath.sqf
ce56b12
@mazinskihenry
Working again
eeccf2e
@mazinskihenry
Add option to disable text
4375982
@mazinskihenry
Add distance for libConversion and one life options
5f143f8
@mazinskihenry
Delete fnc_spectatorRespawn.sqf
e59b2d2
@mazinskihenry
Update XEH_PREP.hpp
7c7ed1d
@mazinskihenry
Update fnc_manualConversionCondition.sqf
30950d3
@mazinskihenry @MiszczuZPolski
Update addons/conversion/ACE_Medical_Treatment_Actions.hpp
5ff9f09 
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
@mazinskihenry @MiszczuZPolski
Update addons/conversion/ACE_Medical_Treatment_Actions.hpp
e0f2a16 
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
@mazinskihenry
Review
3fa54b9
@mazinskihenry
Merge branch 'Role_Two' of https://github.com/mazinskihenry/KAM into …
6c70041 
…Role_Two
@mazinskihenry
Shift statemachine to seperate addon
3493372
@mazinskihenry
Hypothermia change
2a8c11b
@mazinskihenry mazinskihenry added the kind/enhancement Release Notes: **IMPROVED:** label Jan 20, 2025
@mazinskihenry mazinskihenry added this to the 3.0.5 milestone Jan 20, 2025
@Apricot-ale Apricot-ale mentioned this pull request Jan 21, 2025
Merged
@mazinskihenry mazinskihenry modified the milestones: 3.0.5, Ongoing Jan 21, 2025
@Apricot-ale Apricot-ale mentioned this pull request Jan 28, 2025
Merged
@mazinskihenry mazinskihenry modified the milestones: Ongoing, 3.1.0 Jan 29, 2025
@mazinskihenry mazinskihenry deleted the CardiacArrest_Changes branch March 12, 2025 03:00
@mazinskihenry mazinskihenry restored the CardiacArrest_Changes branch March 12, 2025 03:01
@mazinskihenry mazinskihenry reopened this Mar 12, 2025
@Apricot-ale Apricot-ale mentioned this pull request Apr 8, 2025
Closed
MiszczuZPolski pushed a commit that referenced this pull request Apr 14, 2025
@Apricot-ale
Translation - Improve Japanese (and Simp.Chinese a bit) (3.1.0, eye I…
d031704 
…njury) (#722)

**When merged this pull request will:**
- _Add Japanese translation for 3.1.0 Update for eye injury_
- _and small fix for Simple Chinese that messed up by AI translation_

~~Do not merge before State Machine #713 and Conversion #686~~ This
skipped to [another
PR](#757)
@MiszczuZPolski MiszczuZPolski modified the milestones: 3.1.0, 3.1.1 Jun 5, 2025
@MiszczuZPolski MiszczuZPolski modified the milestones: 3.1.3, Ongoing Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

Ongoing

Development

Successfully merging this pull request may close these issues.

2 participants

@mazinskihenry @MiszczuZPolski