From 89b8ed4b56fda4cc81cacf5cfc179a5cddec6a80 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 18 May 2022 14:36:05 -0500 Subject: [PATCH 1/4] Tools - Fix string check false positive on tagging macro (#8917) --- tools/check_strings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/check_strings.py b/tools/check_strings.py index c8e57907e8..7d56d52e01 100644 --- a/tools/check_strings.py +++ b/tools/check_strings.py @@ -78,6 +78,8 @@ def main(argv): allDefinedStrings = list(sorted(set(allDefinedStrings))) allUsedStrings = list(sorted(set(allUsedStrings))) + if ("str_ace_tagging_name" in allUsedStrings): allUsedStrings.remove("str_ace_tagging_name") # Handle tagging macro + print("-----------") countUnusedStrings = 0 countUndefinedStrings = 0 From df13db5958784835e944fb8b05fcb5fda6939ca5 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 22 May 2022 22:51:36 +0200 Subject: [PATCH 2/4] Documentation - Fix Viewports versions (#8919) --- docs/wiki/feature/viewports.md | 4 ++-- docs/wiki/framework/viewports-framework.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/wiki/feature/viewports.md b/docs/wiki/feature/viewports.md index c0e626f07b..b58a73bba3 100644 --- a/docs/wiki/feature/viewports.md +++ b/docs/wiki/feature/viewports.md @@ -8,8 +8,8 @@ parent: wiki mod: ace version: major: 3 - minor: x - patch: y + minor: 15 + patch: 0 --- ## 1. Overview diff --git a/docs/wiki/framework/viewports-framework.md b/docs/wiki/framework/viewports-framework.md index b9d456e55a..31715b2f0c 100644 --- a/docs/wiki/framework/viewports-framework.md +++ b/docs/wiki/framework/viewports-framework.md @@ -8,8 +8,8 @@ parent: wiki mod: ace version: major: 3 - minor: x - patch: y + minor: 15 + patch: 0 --- ## 1. Config Values @@ -18,10 +18,10 @@ Reference [ace_viewports_fnc_getViewports](https://github.com/acemod/ACE3/blob/m ```cpp class myVehicle { - class ace_viewports { + class ace_viewports { class Template { // type [STRING] - Optional - type = ""; + type = ""; // camLocation [ARRAY or STRING] - Required camLocation = "memoryPointP1"; camLocation[] = {1,2,3}; // model offset From 4d783af8275836f40f767971e75189574fe04b6f Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 22 May 2022 22:51:49 +0200 Subject: [PATCH 3/4] replace chat urls (#8918) Co-authored-by: Brett --- .github/CONTRIBUTING.md | 4 ++-- README.md | 8 ++++---- docs/README.zh-TW.md | 8 ++++---- docs/README_DE.md | 6 +++--- docs/README_PL.md | 6 +++--- docs/index.html | 2 +- .../wiki/development/documentation-guidelines-and-tips.md | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6a4ac5806e..af6ab70854 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -34,7 +34,7 @@ We welcome anyone to contribute to this repository. Issues that we are actively ## Pull Request process -When contributing to this repository, please first discuss the change you wish to make via issue or [Slack](https://acemod.org/slack) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already. +When contributing to this repository, please first discuss the change you wish to make via issue or [Discord](https://acemod.org/discord) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already. 1. Please make a pull request (PR) as early as possible. This lets use help you in the proces of developing it. When opening a work in progress pull request, mark your PR with a `WIP:` prefix. 2. Describe what this pull request will do and how it solves this in the description of your PR. A clear intent and description of the way the issue is resolved will help us to review the PR more efficiently. @@ -47,4 +47,4 @@ Please note that all contributors to this project are volunteers and do this in ## Assistance with contributing -If you require assistance with contributing, check out the #dev channel on our [Slack](https://acemod.org/slack). Additional documentation can be found on our [Development wiki](https://ace3.acemod.org/wiki/development/). +If you require assistance with contributing, check out the #dev channel on our [Discord](https://acemod.org/discord). Additional documentation can be found on our [Development wiki](https://ace3.acemod.org/wiki/development/). diff --git a/README.md b/README.md index 8303a3ad6a..431d322e8e 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ ACE3 License - - ACE3 Slack + + ACE3 Discord ACE3 Build Status @@ -105,8 +105,8 @@ To help us test the latest development changes, download our master branch ([dir - - + + diff --git a/docs/README.zh-TW.md b/docs/README.zh-TW.md index f376516a91..4216d82dd7 100644 --- a/docs/README.zh-TW.md +++ b/docs/README.zh-TW.md @@ -18,8 +18,8 @@ ACE3 條款 - - 加入ACE3 Slack + + 加入ACE3 Discord ACE3 建構狀態 @@ -104,8 +104,8 @@ ACE3需要最新版本的武裝行動3以及最新版本的 Slack - + + diff --git a/docs/README_DE.md b/docs/README_DE.md index 9322c7b708..fd7eaeef3f 100644 --- a/docs/README_DE.md +++ b/docs/README_DE.md @@ -3,7 +3,7 @@

- + ACE3 Version @@ -15,8 +15,8 @@ ACE3 Lizenz - - ACE3 Slack + + ACE3 Discord ACE3 Build Status diff --git a/docs/README_PL.md b/docs/README_PL.md index 1f03d6601c..893261dc54 100644 --- a/docs/README_PL.md +++ b/docs/README_PL.md @@ -2,7 +2,7 @@

- + ACE3 Wersja @@ -14,8 +14,8 @@ ACE3 Licencja - - ACE3 Slack + + ACE3 Discord ACE3 Build Status diff --git a/docs/index.html b/docs/index.html index 2e5e9bd305..21df9af763 100644 --- a/docs/index.html +++ b/docs/index.html @@ -64,7 +64,7 @@ sitemap: and more.

-

ACE3 Public Chat
+

ACE3 Public Chat
Join our public chat! We're glad to answer questions concerning ACE3, development or Arma things.
If you made something with this mod (screen shots, artwork, videos) we'd love to see it.

diff --git a/docs/wiki/development/documentation-guidelines-and-tips.md b/docs/wiki/development/documentation-guidelines-and-tips.md index 5a508d14c6..e51960fefe 100644 --- a/docs/wiki/development/documentation-guidelines-and-tips.md +++ b/docs/wiki/development/documentation-guidelines-and-tips.md @@ -12,7 +12,7 @@ order: 19 - This is especially necessary for the kramdown markup syntax. Kramdown needs a line break between each block level element (paragraphs, lists, codeblocks, etc ...) - Use `ACE3` instead of `ACE 3`. - Remove each entry that is not used. -- Don't forget to say what you're going to work on in #documentation in slack or [this topic](https://github.com/acemod/ACE3/issues/1166) +- Don't forget to say what you're going to work on in #dev in Discord or [this topic](https://github.com/acemod/ACE3/issues/1166) - Keybinds in ``` keyboard tags ``` - Keywords in ``` `backticks` ``` - Capitals at the start of a sentence and `.`at the end. From cbc766dec06596daf477fcdd9a58a81ff7a07208 Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 23 May 2022 11:09:05 +0200 Subject: [PATCH 4/4] Documentation - Use title instead of name (#8920) --- docs/_config.yml | 2 +- docs/_config_dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 4a69d58130..1283960be7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,4 +1,4 @@ -name: ACE3 +title: ACE3 description: ACE3 is a joint effort by the teams behind ACE 2, AGM and CSE to improve the realism and authenticity of Arma 3. keywords: Advanced Combat Enhancement 3, ACE, ACE3, Arma, Arma 3, Mod, Modification, Realism, AGM, CSE, Bohemia, Interactive diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index b5cf2bebed..b8908a4684 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -1,4 +1,4 @@ -name: ACE3 +title: ACE3 description: ACE3 is a joint effort by the teams behind ACE 2, AGM and CSE to improve the realism and authenticity of Arma 3. keywords: Advanced Combat Enhancement 3, ACE, ACE3, Arma, Arma 3, Mod, Modification, Realism, AGM, CSE, Bohemia, Interactive
SlackWe have a public Slack team that anyone can join. This is where all our developers and contributors hang out and where we make announcementsDiscordWe have a public Discord server that anyone can join. This is where all our developers and contributors hang out and where we make announcements
我們有著公共的Slack團隊供大家加入，而該模組所有開發者以及維護者也會在此出現並公告Discord我們有著公共的Discord團隊供大家加入，而該模組所有開發者以及維護者也會在此出現並公告