Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: diwako/diwako_dui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.9.3
Choose a base ref
...
head repository: diwako/diwako_dui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.10.0
Choose a head ref
  • 7 commits
  • 35 files changed
  • 4 contributors

Commits on Jul 28, 2022

  1. Verified

    This commit was signed with the committer’s verified signature.
    evenyag Yingwen
    Copy the full SHA
    1c1a2fb View commit details

Commits on Oct 31, 2022

  1. Copy the full SHA
    a063cc3 View commit details

Commits on Nov 1, 2022

  1. Copy the full SHA
    6fc2b5e View commit details

Commits on Dec 24, 2023

  1. Fix many typos (#211)

    German translation more standardised and completed
    Alf-Melmac authored Dec 24, 2023
    Copy the full SHA
    21c3038 View commit details
  2. Minimally improve namelist position calculation (#213)

    diwako authored Dec 24, 2023
    Copy the full SHA
    a507015 View commit details
  3. New Icon Style (#215)

    * Add files via upload
    
    * Add files via upload
    
    * renormalize
    
    * add translation file
    
    ---------
    
    Co-authored-by: diwako <[email protected]>
    CypherV0 and diwako authored Dec 24, 2023
    Copy the full SHA
    1b85edb View commit details

Commits on Dec 25, 2023

  1. Upgrade to latest hemtt (#216)

    diwako authored Dec 25, 2023
    Copy the full SHA
    d45fdeb View commit details
Showing with 881 additions and 363 deletions.
  1. +59 −59 .editorconfig
  2. +12 −12 .gitattributes
  3. +66 −52 .github/workflows/main.yml
  4. +22 −19 .gitignore
  5. +14 −0 .hemtt/hooks/pre_release/set_version.rhai
  6. +43 −0 .hemtt/project.toml
  7. +46 −14 README.md
  8. +1 −1 addons/indicators/$PBOPREFIX$
  9. +12 −12 addons/indicators/stringtable.xml
  10. +1 −1 addons/main/$PBOPREFIX$
  11. +15 −0 addons/main/CfgIconStyles.hpp
  12. BIN addons/main/UI/icon_styles/everlight/Everlight_buddy_compass.paa
  13. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManAT_ca.paa
  14. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManEngineer_ca.paa
  15. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManExplosive_ca.paa
  16. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManLeader_ca.paa
  17. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManMG_ca.paa
  18. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManMedic_ca.paa
  19. BIN addons/main/UI/icon_styles/everlight/Everlight_iconManOfficer_ca.paa
  20. BIN addons/main/UI/icon_styles/everlight/Everlight_iconMan_ca.paa
  21. +1 −1 addons/main/script_mod.hpp
  22. +3 −3 addons/main/script_version.hpp
  23. +141 −99 addons/main/stringtable.xml
  24. +1 −1 addons/nametags/$PBOPREFIX$
  25. +1 −1 addons/nametags/functions/fnc_cacheLoop.sqf
  26. +20 −13 addons/nametags/stringtable.xml
  27. +1 −1 addons/radar/$PBOPREFIX$
  28. +3 −3 addons/radar/functions/fnc_cacheLoop.sqf
  29. +3 −3 addons/radar/functions/fnc_sortNameList.sqf
  30. +0 −48 hemtt.toml
  31. +189 −0 include/a3/ui_f/hpp/defineDIKCodes.inc
  32. +212 −16 include/x/cba/addons/main/script_macros_common.hpp
  33. BIN logolarge.paa
  34. +14 −3 mod.cpp
  35. +1 −1 tools/stringtableDeploy.py
118 changes: 59 additions & 59 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
root = true

[*]
end_of_line = crlf
charset = utf-8

[*.sqf]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.cpp]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.hpp]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.js]
indent_size = 2
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.xml]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.paa]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[*.fsm]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[*.json]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
root = true

[*]
end_of_line = crlf
charset = utf-8

[*.sqf]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.cpp]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.hpp]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.js]
indent_size = 2
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.xml]
indent_size = 4
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

[*.paa]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[*.fsm]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[*.json]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
24 changes: 12 additions & 12 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
*.sqf text eol=crlf
*.hpp text eol=crlf
*.cpp text eol=crlf
*.paa binary
*.fsm text eol=crlf
*.json text eol=crlf
*.js text eol=crlf
*.py text eol=crlf
*.md text eol=crlf
*.toml text eol=crlf
*.txt text eol=crlf
*.xml text eol=crlf
*.sqf text eol=crlf
*.hpp text eol=crlf
*.cpp text eol=crlf
*.paa binary
*.fsm text eol=crlf
*.json text eol=crlf
*.js text eol=crlf
*.py text eol=crlf
*.md text eol=crlf
*.toml text eol=crlf
*.txt text eol=crlf
*.xml text eol=crlf
118 changes: 66 additions & 52 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,66 @@
name: CI

on:
push:
branches:
- master
pull_request:

jobs:
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Validate SQF
run: python3 tools/sqf_validator.py
- name: Validate Config
run: python3 tools/config_style_checker.py
- name: Check for BOM
uses: arma-actions/bom-check@master

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Lint (sqflint)
uses: jokoho48/sqflint@master
continue-on-error: true # No failure due to many false-positives
- uses: actions/upload-artifact@master
with:
name: 'sqfLint Log'
path: 'sqf.log'
- name: Validate SQFLinter Logs
run: python3 tools/sqf_linter_LogChecker.py

stringtables:
runs-on: ubuntu-latest
steps:
- name: Install Python packages
run: |
pip3 install wheel
pip3 install setuptools
pip3 install pygithub
pip3 install pygithub3
- name: Checkout the source code
uses: actions/checkout@master
- name: Update Translation issue
if: github.repository == 'diwako/diwako_dui' && github.ref == 'refs/heads/master' && ! contains(github.event.head_commit.message, '[ci skip]')
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: python3 tools/stringtableDeploy.py
name: CI

on:
push:
branches:
- master
pull_request:

jobs:
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Validate SQF
run: python3 tools/sqf_validator.py
- name: Validate Config
run: python3 tools/config_style_checker.py
- name: Check for BOM
uses: arma-actions/bom-check@master

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Lint (sqflint)
uses: jokoho48/sqflint@master
continue-on-error: true # No failure due to many false-positives
- uses: actions/upload-artifact@master
with:
name: "sqfLint Log"
path: "sqf.log"
- name: Validate SQFLinter Logs
run: python3 tools/sqf_linter_LogChecker.py

stringtables:
runs-on: ubuntu-latest
steps:
- name: Install Python packages
run: |
pip3 install wheel
pip3 install setuptools
pip3 install pygithub
pip3 install pygithub3
- name: Checkout the source code
uses: actions/checkout@master
- name: Update Translation issue
if: github.repository == 'diwako/diwako_dui' && github.ref == 'refs/heads/master' && ! contains(github.event.head_commit.message, '[ci skip]')
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: python3 tools/stringtableDeploy.py

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Setup HEMTT
uses: arma-actions/hemtt@v1
- name: Run HEMTT build
run: hemtt release
# - name: Upload Release
# uses: actions/upload-artifact@v4
# with:
# name: my-mod-latest
# path: release/my-mod-latest.zip
41 changes: 22 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@

*.biprivatekey

hemtt\.exe
armake2\.exe
keys/
releases/
*.pbo

*.bisign

releases/*
keys/*
.hemtt/local
*.pdb
*.exe
*.sqfc
*.bat
*.dll

*.biprivatekey

hemtt\.exe
armake2\.exe
.hemttout/
keys/
releases/
*.pbo

*.bisign

releases/*
keys/*
.hemtt/local
*.pdb
*.exe
*.sqfc
*.bat
*.dll

.vscode/*
14 changes: 14 additions & 0 deletions .hemtt/hooks/pre_release/set_version.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Read the current contents of the mod.cpp
// file from the project source
let version = HEMTT_DIRECTORY
.join("mod.cpp")
.open_file()
.read();
// Replace the placeholder version with the actual version
version.replace("{version}", HEMTT.project().version().to_string_short());
// Write the new contents to the build output
// create_file will overwrite the file if it exists
HEMTT_OUTPUT
.join("mod.cpp")
.create_file()
.write(version);
43 changes: 43 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name = "DUI Squad Radar"
prefix = "diwako_dui"
author = "Diwako"
mainprefix = "z"

[version]
path = "addons/main/script_version.hpp"
git_hash = 0

[files]
include = [
"mod.cpp",
"authors.txt",
"license.txt",
"logolarge.paa",
"logosmall.paa"
]
exclude = [
"*.psd",
"*.png",
"*.tga"
]

[hemtt.launch.default]
workshop = [
"450814997", # CBA_A3's Workshop ID
"463939057" # ACE3
]
parameters = [
"-skipIntro", # These parameters are passed to the Arma 3 executable
"-noSplash", # They do not need to be added to your list
"-showScriptErrors", # You can add additional parameters here
"-debug",
"-world=empty",
"-filePatching",
"C:\\Users\\diwako\\Documents\\Arma 3\\missions\\dui.VR\\mission.sqm", # Launch into existing Editor Mission - \\ needed
]

[hemtt.signing]
authority = "diwako_dui"

[hemtt.release]
folder = "diwako_dui"
Loading