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

Fixed ui becoming visible when the main menu is open. #2

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .asset-template.json.hb
Original file line number Diff line number Diff line change
@@ -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"
}
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions .github/workflows/assetlib.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
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: 1074
approveDirectly: "true"
70 changes: 70 additions & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: "Release new prerelease version"

on:
push:
branches:
- develop

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.ESCORIA_DEPLOYMENT_TOKEN }}
- name: Calculate version
id: calculate_version
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }}
dry_run: true
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=""
if [ -e CHANGELOG.md ]
then
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/[email protected]
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.ESCORIA_DEPLOYMENT_TOKEN }}
- name: Create version
id: create_version
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.ESCORIA_DEPLOYMENT_TOKEN }}
dry_run: true
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:
GITHUB_TOKEN: ${{ secrets.ESCORIA_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 }}
69 changes: 69 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
## [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)



## [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)


### 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)


### 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)


### 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)



## [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)
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions addons/escoria-ui-9verbs/game.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion addons/escoria-ui-9verbs/plugin.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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.30"
script="plugin.gd"