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

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

Merged
merged 42 commits into from
Jan 7, 2024
Merged

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

merged 42 commits into from
Jan 7, 2024

Commits on Jan 8, 2023

  1. Markers - Add setting for system timestamps

    @PabstMirror
    PabstMirror committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    1537255 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Moved time zone to different setting 

    Added UTC Time zone
Added UTC time offset slider
Added translation in stringtable
    @Daniel-H123
    Daniel-H123 committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9b5ee1b View commit details
    Browse the repository at this point in the history

  2. Update fnc_onButtonClickConfirm.sqf 

    Fixed mistake that added offset twice
    @Daniel-H123
    Daniel-H123 authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9ee9c62 View commit details
    Browse the repository at this point in the history

  3. - Removed tabs 

    - Fixed calculating error
    @Daniel-H123
    Daniel-H123 committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    e44246b View commit details
    Browse the repository at this point in the history

  4. - Fixed tab problem 

    Was a bit enthusiastic with removing tabs. This should to the trick.
    @Daniel-H123
    Daniel-H123 committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    d13071b View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. - Changed tabs to spaces (Finaly) 

    - Checked SQF with sqf_validator.py
- Fixed decimal error by CBA menu
    @Daniel-H123
    Daniel-H123 committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    1ea45e0 View commit details
    Browse the repository at this point in the history

  2. Delete build/_deps directory 

    - This does not belong here
    @Daniel-H123
    Daniel-H123 authored Jan 10, 2023
    Configuration menu
    Copy the full SHA
    58b3627 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Update fnc_onButtonClickConfirm.sqf 

    Added empty line back
    @Daniel-H123
    Daniel-H123 authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    35472bb View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Update addons/markers/functions/fnc_onButtonClickConfirm.sqf 

    Formatting update

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Daniel-H123 @LinkIsGrim
    Daniel-H123 and LinkIsGrim authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    90be4ae View commit details
    Browse the repository at this point in the history

  2. Update addons/markers/functions/fnc_onButtonClickConfirm.sqf 

    Formatting update

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Daniel-H123 @LinkIsGrim
    Daniel-H123 and LinkIsGrim authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    38c18f8 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Update initSettings.sqf 

    Added newline at end of file
    @Daniel-H123
    Daniel-H123 authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    55fab6f View commit details
    Browse the repository at this point in the history

  2. Update fnc_onButtonClickConfirm.sqf 

    Fixed fnc header formatting
    @Daniel-H123
    Daniel-H123 authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    89bc582 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Update addons/markers/functions/fnc_onButtonClickConfirm.sqf 

    Formatting

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Daniel-H123 @LinkIsGrim
    Daniel-H123 and LinkIsGrim authored Aug 11, 2023
    Configuration menu
    Copy the full SHA
    cf4324b View commit details
    Browse the repository at this point in the history

  2. Update fnc_onButtonClickConfirm.sqf 

    Updated formatting
    @Daniel-H123
    Daniel-H123 authored Aug 11, 2023
    Configuration menu
    Copy the full SHA
    4a2dfdd View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Merge branch 'master' into pr/9121

    @johnb432
    johnb432 committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    d6b009c View commit details
    Browse the repository at this point in the history

  2. Implemented review changes

    @Daniel-H123
    Daniel-H123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    3596b6a View commit details
    Browse the repository at this point in the history

  3. Review suggestion

    @Daniel-H123
    Daniel-H123 committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    52c1de7 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Bugfix return absolute positive number with modulo

    @Daniel-H123
    Daniel-H123 authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    9cc7fdc View commit details
    Browse the repository at this point in the history

  2. Updated script to allow offset to exeed midnight in the past

    @Daniel-H123
    Daniel-H123 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    ba26991 View commit details
    Browse the repository at this point in the history

  3. Updated script to allow offset to exeed midnight in the past

    @Daniel-H123
    Daniel-H123 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    18f465b View commit details
    Browse the repository at this point in the history

  4. Updated script to allow offset to exeed midnight in the past

    @Daniel-H123
    Daniel-H123 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    8982994 View commit details
    Browse the repository at this point in the history

  5. Fixed merge conflict

    @Daniel-H123
    Daniel-H123 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    42f3f48 View commit details
    Browse the repository at this point in the history

  6. Updated hour offset calculation

    @Daniel-H123
    Daniel-H123 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    b7a82da View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Add support for UTC+13 and +14 timezone

    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    5128345 View commit details
    Browse the repository at this point in the history

  2. Add minutes UTC offset to timestamp

    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    3d3d973 View commit details
    Browse the repository at this point in the history

  3. Add UTC minutes offset setting

    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    f98c5a5 View commit details
    Browse the repository at this point in the history

  4. Add translation for UTC minute offset setting

    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    ee9871a View commit details
    Browse the repository at this point in the history

  5. Prevent timestamp going over 24 after adding minutes offset

    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    256623e View commit details
    Browse the repository at this point in the history

  6. Modify english description for offset settings

    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    991a2fb View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1 from Daniel-H123/markerUtcSysTime 

    Allow UTC minutes offset for marker timestamp
    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    aa5208d View commit details
    Browse the repository at this point in the history

  8. Update addons/markers/initSettings.sqf

    @johnb432
    johnb432 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    ee9162b View commit details
    Browse the repository at this point in the history

  9. Properly handle minute offset with negative timezone

    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    ccbc322 View commit details
    Browse the repository at this point in the history

  10. Implemented better solution to handle negative timestamp seconds offset

    @Daniel-H123
    Daniel-H123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    d2599bd View commit details
    Browse the repository at this point in the history

  11. reverted 'Implemented better solution to handle negative timestamp se… 

    …conds offset'
    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6c2d65e View commit details
    Browse the repository at this point in the history

  12. Merge branch 'markerSysTime' of https://github.com/Daniel-H123/ACE3 i… 

    …nto markerSysTime
    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    eb31958 View commit details
    Browse the repository at this point in the history

  13. Revert "Implemented better solution to handle negative timestamp seco… 

    …nds offset"

This reverts commit d2599bd.
    @Daniel-H123
    Daniel-H123 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    c0f25bb View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Update timestamp calculation comments

    @Daniel-H123
    Daniel-H123 authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    328bc0a View commit details
    Browse the repository at this point in the history

  2. Update timestamp calculation comments

    @Daniel-H123
    Daniel-H123 authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    79b8752 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Update documentation in UTC timestamp calculation

    @Daniel-H123
    Daniel-H123 committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    07ae2b0 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch 'acemod:master' into markerSysTime

    @Daniel-H123
    Daniel-H123 authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    39d1ea2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'acemod:master' into markerSysTime

    @Daniel-H123
    Daniel-H123 authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    430b8d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'master' into pr/9121

    @johnb432
    johnb432 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    b75de46 View commit details
    Browse the repository at this point in the history