From 49a667781656bf9508fd871372dd0e239caf9fb5 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Thu, 14 Oct 2021 19:49:27 +0200 Subject: [PATCH 01/21] docs: Added README and license --- LICENSE | 21 +++++++++++++++++++++ README.md | 11 +++++++++++ 2 files changed, 32 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..08c0dcc --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Escoria framework + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..64d0496 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# Escoria 9 Verbs UI + +![Escoria Logo](https://raw.githubusercontent.com/godot-escoria/escoria-demo-game/main/addons/escoria-core/design/escoria-logo-small.png) + +[![Join our Discord](https://img.shields.io/discord/884336424780984330.svg?label=Join%20our%20Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.com/invite/jMxJjuBY5Z) + +Libre framework for the creation of point-and-click adventure games with the multi-platform game engine [Godot Engine](https://godotengine.org). + +It is designed to be extended with the specific requirements for your game. + +Check out the Escoria documentation, especially the Getting Started Guide for further details. #todo links \ No newline at end of file From c8f51e7a00d7a7acf7f18e72a55eb60b5213ac45 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Fri, 15 Oct 2021 23:05:56 +0200 Subject: [PATCH 02/21] chore: Added release and assetlib workflows --- .asset-template.json.hb | 13 ++++++++ .github/workflows/assetlib.yml | 19 +++++++++++ .github/workflows/release.yml | 60 ++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 .asset-template.json.hb create mode 100644 .github/workflows/assetlib.yml create mode 100644 .github/workflows/release.yml diff --git a/.asset-template.json.hb b/.asset-template.json.hb new file mode 100644 index 0000000..be79a36 --- /dev/null +++ b/.asset-template.json.hb @@ -0,0 +1,13 @@ +{ + "title": "Escoria 9 verbs ui", + "description": "An Escoria stock UI with 9 verbs", + "category_id": "7", + "godot_version": "3.3", + "version_string": "{{ context.release.tag_name }}", + "cost": "MIT", + "download_provider": "GitHub", + "download_commit": "{{ env.GITHUB_SHA }}", + "browse_url": "{{ context.repository.html_url }}", + "issues_url": "https://github.com/godot-escoria/escoria-issues/issues", + "icon_url": "https://github.com/godot-escoria/.github/raw/main/design/escoria-icon.png" +} \ No newline at end of file diff --git a/.github/workflows/assetlib.yml b/.github/workflows/assetlib.yml new file mode 100644 index 0000000..65e0dad --- /dev/null +++ b/.github/workflows/assetlib.yml @@ -0,0 +1,19 @@ +on: + release: + types: + - published +name: "Push to assetlib" + +jobs: + publish: + runs-on: ubuntu-latest + name: "Publish new version to asset lib" + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Godot Asset Lib + uses: deep-entertainment/godot-asset-lib-action@main + with: + username: escoria + password: ${{ secrets.ASSET_STORE_PASSWORD }} + assetId: 4370 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..1e9a926 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,60 @@ +name: "Release new version" + +on: + push: + branches: + - main + +jobs: + prerelease: + if: "${{ github.event.head_commit.message != 'chore: storing version and changelog' }}" + name: Preparing release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + token: ${{ secrets.DEPLOYMENT_TOKEN }} + - name: Calculate version + id: calculate_version + uses: mathieudutour/github-tag-action@v5.5 + with: + tag_prefix: "" + github_token: ${{ secrets.DEPLOYMENT_TOKEN }} + dry_run: true + - name: "Write changelog" + run: | + CHANGELOG="" + if [ -e CHANGELOG.md ] + then + CHANGELOG=$(cat CHANGELOG.md) + fi + echo -e "${{steps.calculate_version.outputs.changelog}}\n\n${CHANGELOG}" > CHANGELOG.md + - name: "Commit" + uses: EndBug/add-and-commit@v7.2.1 + with: + message: "chore: storing version and changelog" + push: true + release: + if: "${{ github.event.head_commit.message == 'chore: storing version and changelog' }}" + name: Release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + token: ${{ secrets.DEPLOYMENT_TOKEN }} + - name: Create version + id: create_version + uses: mathieudutour/github-tag-action@v5.5 + with: + tag_prefix: "" + github_token: ${{ secrets.DEPLOYMENT_TOKEN }} + - name: Create a GitHub release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.DEPLOYMENT_TOKEN }} + with: + tag_name: ${{ steps.create_version.outputs.new_tag }} + release_name: ${{ steps.create_version.outputs.new_tag }} + body: ${{ steps.create_version.outputs.changelog }} From a1687bb1d03de3bac8300e8568605b4369d00676 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sat, 16 Oct 2021 19:04:42 +0200 Subject: [PATCH 03/21] chore: Moved to prerelease workflow --- .github/workflows/{release.yml => prerelease.yml} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename .github/workflows/{release.yml => prerelease.yml} (88%) diff --git a/.github/workflows/release.yml b/.github/workflows/prerelease.yml similarity index 88% rename from .github/workflows/release.yml rename to .github/workflows/prerelease.yml index 1e9a926..5a6eda8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/prerelease.yml @@ -1,9 +1,9 @@ -name: "Release new version" +name: "Release new prerelease version" on: push: branches: - - main + - develop jobs: prerelease: @@ -17,11 +17,13 @@ jobs: token: ${{ secrets.DEPLOYMENT_TOKEN }} - name: Calculate version id: calculate_version - uses: mathieudutour/github-tag-action@v5.5 + uses: mathieudutour/github-tag-action@v5.6 with: - tag_prefix: "" github_token: ${{ secrets.DEPLOYMENT_TOKEN }} dry_run: true + pre_release_branches: "develop" + append_to_pre_release_tag: "alpha" + default_bump: "release" - name: "Write changelog" run: | CHANGELOG="" From f74a8ee62d85e7ca46fcc11629cf0d8bcd0dd6a4 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sat, 16 Oct 2021 17:05:25 +0000 Subject: [PATCH 04/21] chore: storing version and changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6fc6335 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +### [0.0.1-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v0.0.1-alpha.0) (2021-10-16) + + + + From d7a2e8109481cfa9e7183fe91b6a4fe3d2882bb6 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sat, 16 Oct 2021 19:09:40 +0200 Subject: [PATCH 05/21] Delete CHANGELOG.md --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 6fc6335..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -### [0.0.1-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v0.0.1-alpha.0) (2021-10-16) - - - - From c0aa801c37eff7bd0b52de6eac1919695cb4f689 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sat, 16 Oct 2021 17:09:55 +0000 Subject: [PATCH 06/21] chore: storing version and changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..50f5c25 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +## [4.0.0-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.0) (2021-10-16) + + + + From fd71687e0caa512645c569b82798c4d0800f07d6 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sat, 16 Oct 2021 19:19:16 +0200 Subject: [PATCH 07/21] chore: Fixed prerelease workflow --- .github/workflows/prerelease.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 5a6eda8..7709b82 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -48,10 +48,13 @@ jobs: token: ${{ secrets.DEPLOYMENT_TOKEN }} - name: Create version id: create_version - uses: mathieudutour/github-tag-action@v5.5 + uses: mathieudutour/github-tag-action@v5.6 with: - tag_prefix: "" github_token: ${{ secrets.DEPLOYMENT_TOKEN }} + dry_run: true + pre_release_branches: "develop" + append_to_pre_release_tag: "alpha" + default_bump: "release" - name: Create a GitHub release uses: actions/create-release@v1 env: From d7da2f41fe533b678b93de6fd3f971fd509fa318 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sun, 17 Oct 2021 11:42:55 +0200 Subject: [PATCH 08/21] fix: Updated attributes --- .gitattributes | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4403e50 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +/.github export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.asset-template.json.hb export-ignore +/.import export-ignore +/README.md export-ignore +/CHANGELOG.md export-ignore +/LICENSE export-ignore \ No newline at end of file From e0fa80d5605e30c192a0d83bfc546f3194db8fc9 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sat, 16 Oct 2021 17:19:43 +0000 Subject: [PATCH 09/21] chore: storing version and changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f5c25..3b3f954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,4 @@ - +## [4.0.0-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.0) (2021-10-16) From 30342b8a5d5f4d9023837294c882b84fe1ef90fe Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sun, 17 Oct 2021 12:12:11 +0200 Subject: [PATCH 10/21] fix: Fixed prerelease workflow --- .github/workflows/prerelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 7709b82..5561f60 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -24,6 +24,7 @@ jobs: pre_release_branches: "develop" append_to_pre_release_tag: "alpha" default_bump: "release" + custom_release_rules: "fix:prerelease,feat:prerelease" - name: "Write changelog" run: | CHANGELOG="" @@ -55,6 +56,7 @@ jobs: pre_release_branches: "develop" append_to_pre_release_tag: "alpha" default_bump: "release" + custom_release_rules: "fix:prerelease,feat:prerelease" - name: Create a GitHub release uses: actions/create-release@v1 env: From f25980b13231acfb73ea7921384682a7f6476881 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sun, 17 Oct 2021 09:43:28 +0000 Subject: [PATCH 11/21] chore: storing version and changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b3f954..e40e107 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### [4.0.1-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.1-alpha.0) (2021-10-17) + + +### Bug Fixes + +* Updated attributes ([6722bdd](https://github.com/godot-escoria/escoria-ui-9verbs/commit/6722bdd8c1d1eb86d175a374140240cf107d0ee7)) + + + ## [4.0.0-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.0) (2021-10-16) From 4b8ac62b10e0fe401ef3660c902140176c90ff1f Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sun, 17 Oct 2021 13:24:54 +0200 Subject: [PATCH 12/21] feat: Added version bump to plugin.cfg --- .github/workflows/prerelease.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 5561f60..0149622 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -33,6 +33,9 @@ jobs: CHANGELOG=$(cat CHANGELOG.md) fi echo -e "${{steps.calculate_version.outputs.changelog}}\n\n${CHANGELOG}" > CHANGELOG.md + - name: "Update version in plugin.cfg" + run: | + sed -i -re 's/version=".+$/version="${{ steps.calculate_version.outputs.new_version }}"/gi' $(find . -name "plugin.cfg") - name: "Commit" uses: EndBug/add-and-commit@v7.2.1 with: From 28a1438aac047dbca57bfb4c03770cd72fc97b38 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sun, 17 Oct 2021 10:12:32 +0000 Subject: [PATCH 13/21] chore: storing version and changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e40e107..e5ba8e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.0.0-alpha.1](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.1) (2021-10-17) + + +### Bug Fixes + +* Fixed prerelease workflow ([a32b4ea](https://github.com/godot-escoria/escoria-ui-9verbs/commit/a32b4ea898863647bf16bda350e690a725f86ba3)) +* Updated attributes ([6722bdd](https://github.com/godot-escoria/escoria-ui-9verbs/commit/6722bdd8c1d1eb86d175a374140240cf107d0ee7)) + + + ### [4.0.1-alpha.0](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.1-alpha.0) (2021-10-17) From ef3bd91f1de6508574c353752ee9dba754f81129 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Tue, 19 Oct 2021 16:23:30 +0200 Subject: [PATCH 14/21] fix: Fixed Assetlib id --- .github/workflows/assetlib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assetlib.yml b/.github/workflows/assetlib.yml index 65e0dad..cf77e19 100644 --- a/.github/workflows/assetlib.yml +++ b/.github/workflows/assetlib.yml @@ -16,4 +16,4 @@ jobs: with: username: escoria password: ${{ secrets.ASSET_STORE_PASSWORD }} - assetId: 4370 + assetId: 1074 From 796735344c89c013b97747cba6106dfb84d24b88 Mon Sep 17 00:00:00 2001 From: dploeger Date: Sun, 17 Oct 2021 11:25:16 +0000 Subject: [PATCH 15/21] chore: storing version and changelog --- CHANGELOG.md | 9 +++++++++ addons/escoria-ui-9verbs/plugin.cfg | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ba8e6..e119475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [4.0.0-alpha.2](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.2) (2021-10-17) + + +### Features + +* Added version bump to plugin.cfg ([a3ba0a7](https://github.com/godot-escoria/escoria-ui-9verbs/commit/a3ba0a72a7626ac2c9bdc5e3475cf003ce0b4472)) + + + ## [4.0.0-alpha.1](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.1) (2021-10-17) diff --git a/addons/escoria-ui-9verbs/plugin.cfg b/addons/escoria-ui-9verbs/plugin.cfg index 32c3874..9da5299 100644 --- a/addons/escoria-ui-9verbs/plugin.cfg +++ b/addons/escoria-ui-9verbs/plugin.cfg @@ -3,5 +3,5 @@ name="Escoria 9 Verbs UI" description="Classical LucasArts style 9-verbs UI for the Escoria Framework" author="StraToN" -version="1.0.0" +version="4.0.0-alpha.2" script="plugin.gd" From 10a0e958c8a07a5bd044add8bd4359fb66424a62 Mon Sep 17 00:00:00 2001 From: dploeger Date: Tue, 19 Oct 2021 14:24:04 +0000 Subject: [PATCH 16/21] chore: storing version and changelog --- CHANGELOG.md | 9 +++++++++ addons/escoria-ui-9verbs/plugin.cfg | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e119475..4066ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [4.0.0-alpha.3](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.3) (2021-10-19) + + +### Bug Fixes + +* Fixed Assetlib id ([820872a](https://github.com/godot-escoria/escoria-ui-9verbs/commit/820872a439f97a8974ceef4db9a29e20994fe56f)) + + + ## [4.0.0-alpha.2](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.2) (2021-10-17) diff --git a/addons/escoria-ui-9verbs/plugin.cfg b/addons/escoria-ui-9verbs/plugin.cfg index 9da5299..2115030 100644 --- a/addons/escoria-ui-9verbs/plugin.cfg +++ b/addons/escoria-ui-9verbs/plugin.cfg @@ -3,5 +3,5 @@ name="Escoria 9 Verbs UI" description="Classical LucasArts style 9-verbs UI for the Escoria Framework" author="StraToN" -version="4.0.0-alpha.2" +version="4.0.0-alpha.3" script="plugin.gd" From 215b2d567d2dc442486cb1d164e5aac16a7a1225 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Tue, 29 Mar 2022 07:09:21 +0200 Subject: [PATCH 17/21] chore: Approve asset lib edit directly (#1) --- .github/workflows/assetlib.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/assetlib.yml b/.github/workflows/assetlib.yml index cf77e19..aa314f8 100644 --- a/.github/workflows/assetlib.yml +++ b/.github/workflows/assetlib.yml @@ -17,3 +17,4 @@ jobs: username: escoria password: ${{ secrets.ASSET_STORE_PASSWORD }} assetId: 1074 + approveDirectly: "true" From 3ddc984c62253f854cecaa0172820e95988219c0 Mon Sep 17 00:00:00 2001 From: dploeger Date: Tue, 29 Mar 2022 05:09:44 +0000 Subject: [PATCH 18/21] chore: storing version and changelog --- CHANGELOG.md | 4 ++++ addons/escoria-ui-9verbs/plugin.cfg | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4066ffd..ea4b5e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [4.0.0-alpha.20](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.20) (2022-03-29) + + + ## [4.0.0-alpha.3](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.3) (2021-10-19) diff --git a/addons/escoria-ui-9verbs/plugin.cfg b/addons/escoria-ui-9verbs/plugin.cfg index 2115030..9fada97 100644 --- a/addons/escoria-ui-9verbs/plugin.cfg +++ b/addons/escoria-ui-9verbs/plugin.cfg @@ -3,5 +3,5 @@ name="Escoria 9 Verbs UI" description="Classical LucasArts style 9-verbs UI for the Escoria Framework" author="StraToN" -version="4.0.0-alpha.3" +version="4.0.0-alpha.20" script="plugin.gd" From 506234fe64f0e0197436e8a3c6ff9a2066a4f9f8 Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Tue, 23 May 2023 12:39:21 -0400 Subject: [PATCH 19/21] fix: updates to valid token --- .github/workflows/prerelease.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 0149622..6c6083f 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -14,12 +14,12 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - token: ${{ secrets.DEPLOYMENT_TOKEN }} + token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }} - name: Calculate version id: calculate_version uses: mathieudutour/github-tag-action@v5.6 with: - github_token: ${{ secrets.DEPLOYMENT_TOKEN }} + github_token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }} dry_run: true pre_release_branches: "develop" append_to_pre_release_tag: "alpha" @@ -49,12 +49,12 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - token: ${{ secrets.DEPLOYMENT_TOKEN }} + token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }} - name: Create version id: create_version uses: mathieudutour/github-tag-action@v5.6 with: - github_token: ${{ secrets.DEPLOYMENT_TOKEN }} + github_token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }} dry_run: true pre_release_branches: "develop" append_to_pre_release_tag: "alpha" @@ -63,7 +63,7 @@ jobs: - name: Create a GitHub release uses: actions/create-release@v1 env: - GITHUB_TOKEN: ${{ secrets.DEPLOYMENT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }} with: tag_name: ${{ steps.create_version.outputs.new_tag }} release_name: ${{ steps.create_version.outputs.new_tag }} From 770e1c0a4e574571dc35e966a08a11184ffcd3d5 Mon Sep 17 00:00:00 2001 From: BHSDuncan Date: Tue, 23 May 2023 16:39:40 +0000 Subject: [PATCH 20/21] chore: storing version and changelog --- CHANGELOG.md | 23 +++++++++++++++++++++++ addons/escoria-ui-9verbs/plugin.cfg | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4b5e8..31bb6e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +## [4.0.0-alpha.30](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.30) (2023-05-23) + + +### Features + +* Added version bump to plugin.cfg ([4b8ac62](https://github.com/godot-escoria/escoria-ui-9verbs/commit/4b8ac62b10e0fe401ef3660c902140176c90ff1f)) + + +### Bug Fixes + +* clears tooltip when event is finished ([47ab93c](https://github.com/godot-escoria/escoria-ui-9verbs/commit/47ab93cdfe4f0ba53e74d7ce51c29fdb84b2f429)) +* Fixed Assetlib id ([ef3bd91](https://github.com/godot-escoria/escoria-ui-9verbs/commit/ef3bd91f1de6508574c353752ee9dba754f81129)) +* Fixed prerelease workflow ([30342b8](https://github.com/godot-escoria/escoria-ui-9verbs/commit/30342b8a5d5f4d9023837294c882b84fe1ef90fe)) +* Updated attributes ([d7da2f4](https://github.com/godot-escoria/escoria-ui-9verbs/commit/d7da2f41fe533b678b93de6fd3f971fd509fa318)) +* updates to valid token ([506234f](https://github.com/godot-escoria/escoria-ui-9verbs/commit/506234fe64f0e0197436e8a3c6ff9a2066a4f9f8)) + + +### Documentation + +* Added README and license ([49a6677](https://github.com/godot-escoria/escoria-ui-9verbs/commit/49a667781656bf9508fd871372dd0e239caf9fb5)) + + + ## [4.0.0-alpha.20](https://github.com/godot-escoria/escoria-ui-9verbs/compare/v0.0.0...v4.0.0-alpha.20) (2022-03-29) diff --git a/addons/escoria-ui-9verbs/plugin.cfg b/addons/escoria-ui-9verbs/plugin.cfg index 9fada97..4c537ff 100644 --- a/addons/escoria-ui-9verbs/plugin.cfg +++ b/addons/escoria-ui-9verbs/plugin.cfg @@ -3,5 +3,5 @@ name="Escoria 9 Verbs UI" description="Classical LucasArts style 9-verbs UI for the Escoria Framework" author="StraToN" -version="4.0.0-alpha.20" +version="4.0.0-alpha.30" script="plugin.gd" From 6aef6a300fff92cc950b105ffffa91797bef311e Mon Sep 17 00:00:00 2001 From: Daniel Kollmann Date: Sat, 6 Jan 2024 00:58:37 +0900 Subject: [PATCH 21/21] Fixed ui becoming visible when the main menu is open. --- addons/escoria-ui-9verbs/game.gd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/escoria-ui-9verbs/game.gd b/addons/escoria-ui-9verbs/game.gd index 6057172..4237fc9 100644 --- a/addons/escoria-ui-9verbs/game.gd +++ b/addons/escoria-ui-9verbs/game.gd @@ -311,6 +311,10 @@ func hide_ui(): func show_ui(): + # only show ui if the main menu is not open + if get_node(main_menu).visible: + return + $ui/Control.show() verbs_menu.show() if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR):