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

Markers - Add the option for UTC/System time timestamps #9121

Merged
merged 42 commits into from
Jan 7, 2024

Conversation

Daniel-H123
Copy link
Contributor

@Daniel-H123 Daniel-H123 commented Jan 9, 2023

When merged this pull request will:

  • Allow people the option to enable In-game time (default), System time or UTC time for marker timestamps
  • Allow people to set an offset for their timezone when UTC timestamps are enabled

Discussion: #9119

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}.

PabstMirror and others added 5 commits January 8, 2023 17:26
Added UTC Time zone
Added UTC time offset slider
Added translation in stringtable
Fixed mistake that added offset twice
- Fixed calculating error
Was a bit enthusiastic with removing tabs. This should to the trick.
@Daniel-H123
Copy link
Contributor Author

Hope this fixed the "Tab detected at ..." problem. Otherwise I have no idea how to fix it. It has maybe to do with my VSCode sqf formatting plugin.

- Checked SQF with sqf_validator.py
- Fixed decimal error by CBA menu
@Daniel-H123
Copy link
Contributor Author

Sorry for the amount of commits, but finaly found the problem. Changed the indenting tabs to spaces. Checked the sqf by running the validation myself and that seemed to work.
3665d81750ac5da7e4632dfcb9106161

- This does not belong here
addons/markers/initSettings.sqf Outdated Show resolved Hide resolved
addons/markers/functions/fnc_onButtonClickConfirm.sqf Outdated Show resolved Hide resolved
addons/markers/functions/fnc_onButtonClickConfirm.sqf Outdated Show resolved Hide resolved
@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Jul 9, 2023
Daniel-H123 and others added 4 commits August 10, 2023 01:59
Formatting update

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

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Added newline at end of file
Fixed fnc header formatting
Daniel-H123 and others added 2 commits August 11, 2023 19:54
Formatting

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/enhancement Release Notes: **IMPROVED:** labels Aug 11, 2023
@johnb432 johnb432 self-requested a review November 12, 2023 15:27
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.

See comment, but it's fine as is too.

addons/markers/functions/fnc_onButtonClickConfirm.sqf Outdated Show resolved Hide resolved
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

Modulo could also work, but it would need some testing - I tried to use it and it broke with big offsets.

addons/markers/functions/fnc_onButtonClickConfirm.sqf Outdated Show resolved Hide resolved
@Daniel-H123
Copy link
Contributor Author

@johnb432 I'm finished. Hope this works. I've tested it and it worked great for me. Good luck 😄

Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

Looks good to me - @LinkIsGrim can you take a second look?

@johnb432 johnb432 added this to the 3.17.0 milestone Dec 20, 2023
@johnb432 johnb432 modified the milestones: 3.17.0, 3.16.2 Jan 7, 2024
@johnb432 johnb432 merged commit 1563eb9 into acemod:master Jan 7, 2024
5 checks passed
@Daniel-H123 Daniel-H123 deleted the markerSysTime branch January 7, 2024 18:54
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