Skip to content

Markers - Allow placing quick number markers#11019

Merged
PabstMirror merged 14 commits intomasterfrom
markerQuikcNumbering
Mar 7, 2026
Merged

Markers - Allow placing quick number markers#11019
PabstMirror merged 14 commits intomasterfrom
markerQuikcNumbering

Conversation

@PabstMirror
Copy link
Copy Markdown
Contributor

Allows quick numbering by holding alt when placing a marker
no dialog, just get a incrementally numbered mark

20250716181812_1

PabstMirror and others added 2 commits October 29, 2025 22:51
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Oct 30, 2025
PabstMirror and others added 5 commits October 29, 2025 23:18
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@PabstMirror PabstMirror marked this pull request as ready for review January 10, 2026 22:55
PabstMirror and others added 2 commits February 6, 2026 19:57
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@PabstMirror PabstMirror added this to the 3.21.0 milestone Feb 25, 2026
@PabstMirror PabstMirror merged commit 75609f3 into master Mar 7, 2026
3 checks passed
@PabstMirror PabstMirror deleted the markerQuikcNumbering branch March 7, 2026 18:10
tbeswick96 added a commit to tbeswick96/ACE3 that referenced this pull request Mar 17, 2026
Serialize wound entries, medications, triage card, IV bags, occluded
medications, and log entries as named hashmaps instead of positional
arrays. Deserializer supports both formats via isEqualType guards.

- Wounds: [classComplex, amountOf, bleedingRate, woundDamage] → hashmap
- Medications: [med, timeOffset, ttme, mtis, hr, pain, flow, dose] → hashmap
- TriageCard: [item, count, timestamp] → hashmap
- IvBags: [volume, type, partIndex, treatment, rateCoef, item] → hashmap
- OccludedMedications: [partIndex, className] → hashmap
- Logs: [logType, entries] → hashmap with entry hashmaps

Also includes upstream merge (upstream/master → uksfcustom) which brings:
- Fix serializeState modifying unit medications array (acemod#11309)
- Add API to directly add wounds to units (acemod#11211)
- Markers: allow placing quick number markers (acemod#11019)
- Maverick displayname consistency (acemod#11310)
- arma-rs 1.12.1, extension bump

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.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.

4 participants