From e8b93b861114d4219b3f17c9ea539b597a089579 Mon Sep 17 00:00:00 2001 From: myin Date: Sat, 17 Jun 2023 10:06:30 +0200 Subject: [PATCH] move to godot folder --- .github/workflows/release.yml | 12 +-- .github/workflows/test.yml | 5 +- .github/workflows/web.yml | 3 +- _sprites/.gdignore | 1 - addons/debug/prepare-build.sh | 21 ---- .gutconfig.json => godot/.gutconfig.json | 0 {addons => godot/addons}/debug/Build.gd | 0 {addons => godot/addons}/debug/Debug.gd | 0 {addons => godot/addons}/debug/Debug.tscn | 0 {addons => godot/addons}/debug/Env.gd | 0 {addons => godot/addons}/debug/Logger.gd | 0 {addons => godot/addons}/debug/README.md | 0 .../addons}/godot-css-theme/ArgumentParser.gd | 0 .../addons}/godot-css-theme/CSSParser.gd | 0 .../addons}/godot-css-theme/CSSSimplifier.gd | 0 .../addons}/godot-css-theme/LICENSE.txt | 0 .../addons}/godot-css-theme/Options.gd | 0 .../addons}/godot-css-theme/Stylesheet.gd | 0 .../addons}/godot-css-theme/ThemeApplier.gd | 0 .../addons}/godot-css-theme/convert.gd | 0 .../addons}/godot-css-theme/optparse.gd | 0 .../addons}/godot-css-theme/plugin.cfg | 0 .../addons}/godot-css-theme/plugin.gd | 0 {addons => godot/addons}/i18n/README.md | 0 {addons => godot/addons}/i18n/babelrc | 0 {addons => godot/addons}/i18n/de.po | 0 {addons => godot/addons}/i18n/en.po | 0 .../addons}/i18n/menu/LanguageSelect.gd | 0 .../addons}/i18n/menu/LanguageSelect.tscn | 0 {addons => godot/addons}/i18n/messages.mo | Bin {addons => godot/addons}/i18n/messages.pot | 0 .../addons}/i18n/requirements.txt | 0 .../addons}/input-system/DeviceSwitcher.gd | 0 .../addons}/input-system/InputReader.gd | 0 .../addons}/input-system/InputType.gd | 0 .../addons}/input-system/PlayerInput.gd | 0 .../addons}/input-system/README.md | 0 .../addons}/input-system/TouchReader.gd | 0 .../addons}/menu-system/AudioSlider.gd | 0 {addons => godot/addons}/menu-system/Menu.gd | 0 .../addons}/menu-system/README.md | 0 .../addons}/menu-system/RemapButton.gd | 0 .../addons}/menu-system/RemapButton.tscn | 0 .../addons}/save-system/CacheManager.gd | 0 .../addons}/save-system/CacheProperties.gd | 0 .../addons}/save-system/README.md | 0 .../addons}/save-system/SaveManager.gd | 0 .../addons}/scene-manager/README.md | 0 .../addons}/scene-manager/SceneManager.gd | 0 .../addons}/scene-manager/SceneManager.tscn | 0 .../addons}/scene-manager/Transition.gdshader | 0 .../scene-manager/shader_patterns/circle.png | Bin .../shader_patterns/circle.png.import | 0 .../shader_patterns/curtains.png | Bin .../shader_patterns/curtains.png.import | 0 .../shader_patterns/diagonal.png | Bin .../shader_patterns/diagonal.png.import | 0 .../scene-manager/shader_patterns/full.png | Bin .../shader_patterns/full.png.import | 0 .../shader_patterns/horizontal.png | Bin .../shader_patterns/horizontal.png.import | 0 .../scene-manager/shader_patterns/radial.png | Bin .../shader_patterns/radial.png.import | 0 .../shader_patterns/scribbles.png | Bin .../shader_patterns/scribbles.png.import | 0 .../scene-manager/shader_patterns/squares.png | Bin .../shader_patterns/squares.png.import | 0 .../shader_patterns/vertical.png | Bin .../shader_patterns/vertical.png.import | 0 {assets => godot/assets}/.gitkeep | 0 .../export_presets.cfg | 0 icon.svg => godot/icon.svg | 0 icon.svg.import => godot/icon.svg.import | 0 project.godot => godot/project.godot | 0 {shared => godot/shared}/CameraShake.gd | 0 {shared => godot/shared}/FrameFreeze.gd | 0 {shared => godot/shared}/SoftCollision.gd | 0 {shared => godot/shared}/effect/Effect.gd | 0 {shared => godot/shared}/effect/FadeEffect.gd | 0 .../shared}/effect/PositionEffect.gd | 0 {shared => godot/shared}/items/Hand.gd | 0 .../shared}/items/Interactable.gd | 0 .../shared}/items/sprite_outline.tres | 0 .../shared}/shaders/blur.gdshader | 0 {shared => godot/shared}/shaders/hit.gdshader | 0 .../shared}/shaders/outline.gdshader | 0 {src => godot/src}/game.tscn | 0 {src => godot/src}/menu/AudioSettings.gd | 0 {src => godot/src}/menu/InputSetting.gd | 0 {src => godot/src}/menu/Options.gd | 0 {src => godot/src}/menu/Options.tscn | 0 {src => godot/src}/menu/Pause.gd | 0 {src => godot/src}/menu/Pause.tscn | 0 {src => godot/src}/menu/PauseRoot.gd | 0 {theme => godot/theme}/jackeyfont.ttf | Bin {theme => godot/theme}/jackeyfont.ttf.import | 0 {theme => godot/theme}/theme.scss | 0 {theme => godot/theme}/theme.tres | 0 scripts/.gdignore | 1 - scripts/build-channel.sh | 2 + scripts/combine-sprites.sh | 2 +- {theme => scripts}/generate-theme.sh | 1 + scripts/init-template.sh | 2 +- scripts/publish.sh | 4 +- {addons/i18n => scripts}/translations.sh | 2 +- tools/SpriteAnimTool.gd | 102 ------------------ 106 files changed, 17 insertions(+), 141 deletions(-) delete mode 100644 _sprites/.gdignore delete mode 100644 addons/debug/prepare-build.sh rename .gutconfig.json => godot/.gutconfig.json (100%) rename {addons => godot/addons}/debug/Build.gd (100%) rename {addons => godot/addons}/debug/Debug.gd (100%) rename {addons => godot/addons}/debug/Debug.tscn (100%) rename {addons => godot/addons}/debug/Env.gd (100%) rename {addons => godot/addons}/debug/Logger.gd (100%) rename {addons => godot/addons}/debug/README.md (100%) rename {addons => godot/addons}/godot-css-theme/ArgumentParser.gd (100%) rename {addons => godot/addons}/godot-css-theme/CSSParser.gd (100%) rename {addons => godot/addons}/godot-css-theme/CSSSimplifier.gd (100%) rename {addons => godot/addons}/godot-css-theme/LICENSE.txt (100%) rename {addons => godot/addons}/godot-css-theme/Options.gd (100%) rename {addons => godot/addons}/godot-css-theme/Stylesheet.gd (100%) rename {addons => godot/addons}/godot-css-theme/ThemeApplier.gd (100%) rename {addons => godot/addons}/godot-css-theme/convert.gd (100%) rename {addons => godot/addons}/godot-css-theme/optparse.gd (100%) rename {addons => godot/addons}/godot-css-theme/plugin.cfg (100%) rename {addons => godot/addons}/godot-css-theme/plugin.gd (100%) rename {addons => godot/addons}/i18n/README.md (100%) rename {addons => godot/addons}/i18n/babelrc (100%) rename {addons => godot/addons}/i18n/de.po (100%) rename {addons => godot/addons}/i18n/en.po (100%) rename {addons => godot/addons}/i18n/menu/LanguageSelect.gd (100%) rename {addons => godot/addons}/i18n/menu/LanguageSelect.tscn (100%) rename {addons => godot/addons}/i18n/messages.mo (100%) rename {addons => godot/addons}/i18n/messages.pot (100%) rename {addons => godot/addons}/i18n/requirements.txt (100%) rename {addons => godot/addons}/input-system/DeviceSwitcher.gd (100%) rename {addons => godot/addons}/input-system/InputReader.gd (100%) rename {addons => godot/addons}/input-system/InputType.gd (100%) rename {addons => godot/addons}/input-system/PlayerInput.gd (100%) rename {addons => godot/addons}/input-system/README.md (100%) rename {addons => godot/addons}/input-system/TouchReader.gd (100%) rename {addons => godot/addons}/menu-system/AudioSlider.gd (100%) rename {addons => godot/addons}/menu-system/Menu.gd (100%) rename {addons => godot/addons}/menu-system/README.md (100%) rename {addons => godot/addons}/menu-system/RemapButton.gd (100%) rename {addons => godot/addons}/menu-system/RemapButton.tscn (100%) rename {addons => godot/addons}/save-system/CacheManager.gd (100%) rename {addons => godot/addons}/save-system/CacheProperties.gd (100%) rename {addons => godot/addons}/save-system/README.md (100%) rename {addons => godot/addons}/save-system/SaveManager.gd (100%) rename {addons => godot/addons}/scene-manager/README.md (100%) rename {addons => godot/addons}/scene-manager/SceneManager.gd (100%) rename {addons => godot/addons}/scene-manager/SceneManager.tscn (100%) rename {addons => godot/addons}/scene-manager/Transition.gdshader (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/circle.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/circle.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/curtains.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/curtains.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/diagonal.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/diagonal.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/full.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/full.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/horizontal.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/horizontal.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/radial.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/radial.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/scribbles.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/scribbles.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/squares.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/squares.png.import (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/vertical.png (100%) rename {addons => godot/addons}/scene-manager/shader_patterns/vertical.png.import (100%) rename {assets => godot/assets}/.gitkeep (100%) rename export_presets.cfg => godot/export_presets.cfg (100%) rename icon.svg => godot/icon.svg (100%) rename icon.svg.import => godot/icon.svg.import (100%) rename project.godot => godot/project.godot (100%) rename {shared => godot/shared}/CameraShake.gd (100%) rename {shared => godot/shared}/FrameFreeze.gd (100%) rename {shared => godot/shared}/SoftCollision.gd (100%) rename {shared => godot/shared}/effect/Effect.gd (100%) rename {shared => godot/shared}/effect/FadeEffect.gd (100%) rename {shared => godot/shared}/effect/PositionEffect.gd (100%) rename {shared => godot/shared}/items/Hand.gd (100%) rename {shared => godot/shared}/items/Interactable.gd (100%) rename {shared => godot/shared}/items/sprite_outline.tres (100%) rename {shared => godot/shared}/shaders/blur.gdshader (100%) rename {shared => godot/shared}/shaders/hit.gdshader (100%) rename {shared => godot/shared}/shaders/outline.gdshader (100%) rename {src => godot/src}/game.tscn (100%) rename {src => godot/src}/menu/AudioSettings.gd (100%) rename {src => godot/src}/menu/InputSetting.gd (100%) rename {src => godot/src}/menu/Options.gd (100%) rename {src => godot/src}/menu/Options.tscn (100%) rename {src => godot/src}/menu/Pause.gd (100%) rename {src => godot/src}/menu/Pause.tscn (100%) rename {src => godot/src}/menu/PauseRoot.gd (100%) rename {theme => godot/theme}/jackeyfont.ttf (100%) rename {theme => godot/theme}/jackeyfont.ttf.import (100%) rename {theme => godot/theme}/theme.scss (100%) rename {theme => godot/theme}/theme.tres (100%) delete mode 100644 scripts/.gdignore rename {theme => scripts}/generate-theme.sh (93%) rename {addons/i18n => scripts}/translations.sh (95%) delete mode 100644 tools/SpriteAnimTool.gd diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77d2ef9..737e877 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,9 @@ name: Release on: - workflow_dispatch: {} - # push: - # tags: - # - "v*.*.*" + push: + tags: + - "v*.*.*" jobs: release: @@ -44,11 +43,8 @@ jobs: sed 's@keystore/release_user=".*"@keystore/release_user="'$ANDROID_KEYSTORE_USER'"@g' -i export_presets.cfg sed 's@keystore/release_password=".*"@keystore/release_password="'$ANDROID_KEYSTORE_PW'"@g' -i export_presets.cfg - - name: Prepare Build - run: ./addons/debug/prepare-build.sh $GITHUB_REF_NAME - - name: Build - run: ./scripts/build-channel.sh $CHANNEL + run: ./scripts/build-channel.sh $CHANNEL $GITHUB_REF_NAME - name: Publish Itch if: env.BUTLER_API_KEY && env.USER && env.GAME && !contains(github.ref, '-rc') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2af366f..e635c1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,10 +9,11 @@ jobs: name: Run Unit Tests runs-on: ubuntu-latest container: - image: barichello/godot-ci:3.5.1 + image: barichello/godot-ci:4.0.3 steps: - uses: actions/checkout@v3 with: lfs: true - - run: sh scripts/ci/test.sh + submodules: true + - run: sh scripts/test.sh timeout-minutes: 5 diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 54ac66e..3f5dce8 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -8,11 +8,12 @@ jobs: name: Publish Web runs-on: ubuntu-latest container: - image: barichello/godot-ci:3.5.1 + image: barichello/godot-ci:4.0.3 steps: - uses: actions/checkout@v3 with: lfs: true + submodules: true - run: ./scripts/ci/prepare-templates.sh - run: ./scripts/ci/build-channel.sh web - run: apt-get update && apt-get install -y rsync diff --git a/_sprites/.gdignore b/_sprites/.gdignore deleted file mode 100644 index 8b13789..0000000 --- a/_sprites/.gdignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/addons/debug/prepare-build.sh b/addons/debug/prepare-build.sh deleted file mode 100644 index ccaf2b8..0000000 --- a/addons/debug/prepare-build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -CLIENT_VERSION=$1 - -# Use the Git hash if no CLIENT_VERSION is given. -if [ -z "$CLIENT_VERSION" ]; then - # GitLab CI: - if [ -n "$CI_COMMIT_SHA" ]; then - CLIENT_VERSION="$CI_COMMIT_SHA" - - # GitHub Actions: - elif [ -n "$GITHUB_SHA" ]; then - CLIENT_VERSION="$GITHUB_SHA" - fi -fi - -cat << EOF > addons/debug/Build.gd -class_name Build - -const VERSION = '$CLIENT_VERSION' -EOF \ No newline at end of file diff --git a/.gutconfig.json b/godot/.gutconfig.json similarity index 100% rename from .gutconfig.json rename to godot/.gutconfig.json diff --git a/addons/debug/Build.gd b/godot/addons/debug/Build.gd similarity index 100% rename from addons/debug/Build.gd rename to godot/addons/debug/Build.gd diff --git a/addons/debug/Debug.gd b/godot/addons/debug/Debug.gd similarity index 100% rename from addons/debug/Debug.gd rename to godot/addons/debug/Debug.gd diff --git a/addons/debug/Debug.tscn b/godot/addons/debug/Debug.tscn similarity index 100% rename from addons/debug/Debug.tscn rename to godot/addons/debug/Debug.tscn diff --git a/addons/debug/Env.gd b/godot/addons/debug/Env.gd similarity index 100% rename from addons/debug/Env.gd rename to godot/addons/debug/Env.gd diff --git a/addons/debug/Logger.gd b/godot/addons/debug/Logger.gd similarity index 100% rename from addons/debug/Logger.gd rename to godot/addons/debug/Logger.gd diff --git a/addons/debug/README.md b/godot/addons/debug/README.md similarity index 100% rename from addons/debug/README.md rename to godot/addons/debug/README.md diff --git a/addons/godot-css-theme/ArgumentParser.gd b/godot/addons/godot-css-theme/ArgumentParser.gd similarity index 100% rename from addons/godot-css-theme/ArgumentParser.gd rename to godot/addons/godot-css-theme/ArgumentParser.gd diff --git a/addons/godot-css-theme/CSSParser.gd b/godot/addons/godot-css-theme/CSSParser.gd similarity index 100% rename from addons/godot-css-theme/CSSParser.gd rename to godot/addons/godot-css-theme/CSSParser.gd diff --git a/addons/godot-css-theme/CSSSimplifier.gd b/godot/addons/godot-css-theme/CSSSimplifier.gd similarity index 100% rename from addons/godot-css-theme/CSSSimplifier.gd rename to godot/addons/godot-css-theme/CSSSimplifier.gd diff --git a/addons/godot-css-theme/LICENSE.txt b/godot/addons/godot-css-theme/LICENSE.txt similarity index 100% rename from addons/godot-css-theme/LICENSE.txt rename to godot/addons/godot-css-theme/LICENSE.txt diff --git a/addons/godot-css-theme/Options.gd b/godot/addons/godot-css-theme/Options.gd similarity index 100% rename from addons/godot-css-theme/Options.gd rename to godot/addons/godot-css-theme/Options.gd diff --git a/addons/godot-css-theme/Stylesheet.gd b/godot/addons/godot-css-theme/Stylesheet.gd similarity index 100% rename from addons/godot-css-theme/Stylesheet.gd rename to godot/addons/godot-css-theme/Stylesheet.gd diff --git a/addons/godot-css-theme/ThemeApplier.gd b/godot/addons/godot-css-theme/ThemeApplier.gd similarity index 100% rename from addons/godot-css-theme/ThemeApplier.gd rename to godot/addons/godot-css-theme/ThemeApplier.gd diff --git a/addons/godot-css-theme/convert.gd b/godot/addons/godot-css-theme/convert.gd similarity index 100% rename from addons/godot-css-theme/convert.gd rename to godot/addons/godot-css-theme/convert.gd diff --git a/addons/godot-css-theme/optparse.gd b/godot/addons/godot-css-theme/optparse.gd similarity index 100% rename from addons/godot-css-theme/optparse.gd rename to godot/addons/godot-css-theme/optparse.gd diff --git a/addons/godot-css-theme/plugin.cfg b/godot/addons/godot-css-theme/plugin.cfg similarity index 100% rename from addons/godot-css-theme/plugin.cfg rename to godot/addons/godot-css-theme/plugin.cfg diff --git a/addons/godot-css-theme/plugin.gd b/godot/addons/godot-css-theme/plugin.gd similarity index 100% rename from addons/godot-css-theme/plugin.gd rename to godot/addons/godot-css-theme/plugin.gd diff --git a/addons/i18n/README.md b/godot/addons/i18n/README.md similarity index 100% rename from addons/i18n/README.md rename to godot/addons/i18n/README.md diff --git a/addons/i18n/babelrc b/godot/addons/i18n/babelrc similarity index 100% rename from addons/i18n/babelrc rename to godot/addons/i18n/babelrc diff --git a/addons/i18n/de.po b/godot/addons/i18n/de.po similarity index 100% rename from addons/i18n/de.po rename to godot/addons/i18n/de.po diff --git a/addons/i18n/en.po b/godot/addons/i18n/en.po similarity index 100% rename from addons/i18n/en.po rename to godot/addons/i18n/en.po diff --git a/addons/i18n/menu/LanguageSelect.gd b/godot/addons/i18n/menu/LanguageSelect.gd similarity index 100% rename from addons/i18n/menu/LanguageSelect.gd rename to godot/addons/i18n/menu/LanguageSelect.gd diff --git a/addons/i18n/menu/LanguageSelect.tscn b/godot/addons/i18n/menu/LanguageSelect.tscn similarity index 100% rename from addons/i18n/menu/LanguageSelect.tscn rename to godot/addons/i18n/menu/LanguageSelect.tscn diff --git a/addons/i18n/messages.mo b/godot/addons/i18n/messages.mo similarity index 100% rename from addons/i18n/messages.mo rename to godot/addons/i18n/messages.mo diff --git a/addons/i18n/messages.pot b/godot/addons/i18n/messages.pot similarity index 100% rename from addons/i18n/messages.pot rename to godot/addons/i18n/messages.pot diff --git a/addons/i18n/requirements.txt b/godot/addons/i18n/requirements.txt similarity index 100% rename from addons/i18n/requirements.txt rename to godot/addons/i18n/requirements.txt diff --git a/addons/input-system/DeviceSwitcher.gd b/godot/addons/input-system/DeviceSwitcher.gd similarity index 100% rename from addons/input-system/DeviceSwitcher.gd rename to godot/addons/input-system/DeviceSwitcher.gd diff --git a/addons/input-system/InputReader.gd b/godot/addons/input-system/InputReader.gd similarity index 100% rename from addons/input-system/InputReader.gd rename to godot/addons/input-system/InputReader.gd diff --git a/addons/input-system/InputType.gd b/godot/addons/input-system/InputType.gd similarity index 100% rename from addons/input-system/InputType.gd rename to godot/addons/input-system/InputType.gd diff --git a/addons/input-system/PlayerInput.gd b/godot/addons/input-system/PlayerInput.gd similarity index 100% rename from addons/input-system/PlayerInput.gd rename to godot/addons/input-system/PlayerInput.gd diff --git a/addons/input-system/README.md b/godot/addons/input-system/README.md similarity index 100% rename from addons/input-system/README.md rename to godot/addons/input-system/README.md diff --git a/addons/input-system/TouchReader.gd b/godot/addons/input-system/TouchReader.gd similarity index 100% rename from addons/input-system/TouchReader.gd rename to godot/addons/input-system/TouchReader.gd diff --git a/addons/menu-system/AudioSlider.gd b/godot/addons/menu-system/AudioSlider.gd similarity index 100% rename from addons/menu-system/AudioSlider.gd rename to godot/addons/menu-system/AudioSlider.gd diff --git a/addons/menu-system/Menu.gd b/godot/addons/menu-system/Menu.gd similarity index 100% rename from addons/menu-system/Menu.gd rename to godot/addons/menu-system/Menu.gd diff --git a/addons/menu-system/README.md b/godot/addons/menu-system/README.md similarity index 100% rename from addons/menu-system/README.md rename to godot/addons/menu-system/README.md diff --git a/addons/menu-system/RemapButton.gd b/godot/addons/menu-system/RemapButton.gd similarity index 100% rename from addons/menu-system/RemapButton.gd rename to godot/addons/menu-system/RemapButton.gd diff --git a/addons/menu-system/RemapButton.tscn b/godot/addons/menu-system/RemapButton.tscn similarity index 100% rename from addons/menu-system/RemapButton.tscn rename to godot/addons/menu-system/RemapButton.tscn diff --git a/addons/save-system/CacheManager.gd b/godot/addons/save-system/CacheManager.gd similarity index 100% rename from addons/save-system/CacheManager.gd rename to godot/addons/save-system/CacheManager.gd diff --git a/addons/save-system/CacheProperties.gd b/godot/addons/save-system/CacheProperties.gd similarity index 100% rename from addons/save-system/CacheProperties.gd rename to godot/addons/save-system/CacheProperties.gd diff --git a/addons/save-system/README.md b/godot/addons/save-system/README.md similarity index 100% rename from addons/save-system/README.md rename to godot/addons/save-system/README.md diff --git a/addons/save-system/SaveManager.gd b/godot/addons/save-system/SaveManager.gd similarity index 100% rename from addons/save-system/SaveManager.gd rename to godot/addons/save-system/SaveManager.gd diff --git a/addons/scene-manager/README.md b/godot/addons/scene-manager/README.md similarity index 100% rename from addons/scene-manager/README.md rename to godot/addons/scene-manager/README.md diff --git a/addons/scene-manager/SceneManager.gd b/godot/addons/scene-manager/SceneManager.gd similarity index 100% rename from addons/scene-manager/SceneManager.gd rename to godot/addons/scene-manager/SceneManager.gd diff --git a/addons/scene-manager/SceneManager.tscn b/godot/addons/scene-manager/SceneManager.tscn similarity index 100% rename from addons/scene-manager/SceneManager.tscn rename to godot/addons/scene-manager/SceneManager.tscn diff --git a/addons/scene-manager/Transition.gdshader b/godot/addons/scene-manager/Transition.gdshader similarity index 100% rename from addons/scene-manager/Transition.gdshader rename to godot/addons/scene-manager/Transition.gdshader diff --git a/addons/scene-manager/shader_patterns/circle.png b/godot/addons/scene-manager/shader_patterns/circle.png similarity index 100% rename from addons/scene-manager/shader_patterns/circle.png rename to godot/addons/scene-manager/shader_patterns/circle.png diff --git a/addons/scene-manager/shader_patterns/circle.png.import b/godot/addons/scene-manager/shader_patterns/circle.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/circle.png.import rename to godot/addons/scene-manager/shader_patterns/circle.png.import diff --git a/addons/scene-manager/shader_patterns/curtains.png b/godot/addons/scene-manager/shader_patterns/curtains.png similarity index 100% rename from addons/scene-manager/shader_patterns/curtains.png rename to godot/addons/scene-manager/shader_patterns/curtains.png diff --git a/addons/scene-manager/shader_patterns/curtains.png.import b/godot/addons/scene-manager/shader_patterns/curtains.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/curtains.png.import rename to godot/addons/scene-manager/shader_patterns/curtains.png.import diff --git a/addons/scene-manager/shader_patterns/diagonal.png b/godot/addons/scene-manager/shader_patterns/diagonal.png similarity index 100% rename from addons/scene-manager/shader_patterns/diagonal.png rename to godot/addons/scene-manager/shader_patterns/diagonal.png diff --git a/addons/scene-manager/shader_patterns/diagonal.png.import b/godot/addons/scene-manager/shader_patterns/diagonal.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/diagonal.png.import rename to godot/addons/scene-manager/shader_patterns/diagonal.png.import diff --git a/addons/scene-manager/shader_patterns/full.png b/godot/addons/scene-manager/shader_patterns/full.png similarity index 100% rename from addons/scene-manager/shader_patterns/full.png rename to godot/addons/scene-manager/shader_patterns/full.png diff --git a/addons/scene-manager/shader_patterns/full.png.import b/godot/addons/scene-manager/shader_patterns/full.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/full.png.import rename to godot/addons/scene-manager/shader_patterns/full.png.import diff --git a/addons/scene-manager/shader_patterns/horizontal.png b/godot/addons/scene-manager/shader_patterns/horizontal.png similarity index 100% rename from addons/scene-manager/shader_patterns/horizontal.png rename to godot/addons/scene-manager/shader_patterns/horizontal.png diff --git a/addons/scene-manager/shader_patterns/horizontal.png.import b/godot/addons/scene-manager/shader_patterns/horizontal.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/horizontal.png.import rename to godot/addons/scene-manager/shader_patterns/horizontal.png.import diff --git a/addons/scene-manager/shader_patterns/radial.png b/godot/addons/scene-manager/shader_patterns/radial.png similarity index 100% rename from addons/scene-manager/shader_patterns/radial.png rename to godot/addons/scene-manager/shader_patterns/radial.png diff --git a/addons/scene-manager/shader_patterns/radial.png.import b/godot/addons/scene-manager/shader_patterns/radial.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/radial.png.import rename to godot/addons/scene-manager/shader_patterns/radial.png.import diff --git a/addons/scene-manager/shader_patterns/scribbles.png b/godot/addons/scene-manager/shader_patterns/scribbles.png similarity index 100% rename from addons/scene-manager/shader_patterns/scribbles.png rename to godot/addons/scene-manager/shader_patterns/scribbles.png diff --git a/addons/scene-manager/shader_patterns/scribbles.png.import b/godot/addons/scene-manager/shader_patterns/scribbles.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/scribbles.png.import rename to godot/addons/scene-manager/shader_patterns/scribbles.png.import diff --git a/addons/scene-manager/shader_patterns/squares.png b/godot/addons/scene-manager/shader_patterns/squares.png similarity index 100% rename from addons/scene-manager/shader_patterns/squares.png rename to godot/addons/scene-manager/shader_patterns/squares.png diff --git a/addons/scene-manager/shader_patterns/squares.png.import b/godot/addons/scene-manager/shader_patterns/squares.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/squares.png.import rename to godot/addons/scene-manager/shader_patterns/squares.png.import diff --git a/addons/scene-manager/shader_patterns/vertical.png b/godot/addons/scene-manager/shader_patterns/vertical.png similarity index 100% rename from addons/scene-manager/shader_patterns/vertical.png rename to godot/addons/scene-manager/shader_patterns/vertical.png diff --git a/addons/scene-manager/shader_patterns/vertical.png.import b/godot/addons/scene-manager/shader_patterns/vertical.png.import similarity index 100% rename from addons/scene-manager/shader_patterns/vertical.png.import rename to godot/addons/scene-manager/shader_patterns/vertical.png.import diff --git a/assets/.gitkeep b/godot/assets/.gitkeep similarity index 100% rename from assets/.gitkeep rename to godot/assets/.gitkeep diff --git a/export_presets.cfg b/godot/export_presets.cfg similarity index 100% rename from export_presets.cfg rename to godot/export_presets.cfg diff --git a/icon.svg b/godot/icon.svg similarity index 100% rename from icon.svg rename to godot/icon.svg diff --git a/icon.svg.import b/godot/icon.svg.import similarity index 100% rename from icon.svg.import rename to godot/icon.svg.import diff --git a/project.godot b/godot/project.godot similarity index 100% rename from project.godot rename to godot/project.godot diff --git a/shared/CameraShake.gd b/godot/shared/CameraShake.gd similarity index 100% rename from shared/CameraShake.gd rename to godot/shared/CameraShake.gd diff --git a/shared/FrameFreeze.gd b/godot/shared/FrameFreeze.gd similarity index 100% rename from shared/FrameFreeze.gd rename to godot/shared/FrameFreeze.gd diff --git a/shared/SoftCollision.gd b/godot/shared/SoftCollision.gd similarity index 100% rename from shared/SoftCollision.gd rename to godot/shared/SoftCollision.gd diff --git a/shared/effect/Effect.gd b/godot/shared/effect/Effect.gd similarity index 100% rename from shared/effect/Effect.gd rename to godot/shared/effect/Effect.gd diff --git a/shared/effect/FadeEffect.gd b/godot/shared/effect/FadeEffect.gd similarity index 100% rename from shared/effect/FadeEffect.gd rename to godot/shared/effect/FadeEffect.gd diff --git a/shared/effect/PositionEffect.gd b/godot/shared/effect/PositionEffect.gd similarity index 100% rename from shared/effect/PositionEffect.gd rename to godot/shared/effect/PositionEffect.gd diff --git a/shared/items/Hand.gd b/godot/shared/items/Hand.gd similarity index 100% rename from shared/items/Hand.gd rename to godot/shared/items/Hand.gd diff --git a/shared/items/Interactable.gd b/godot/shared/items/Interactable.gd similarity index 100% rename from shared/items/Interactable.gd rename to godot/shared/items/Interactable.gd diff --git a/shared/items/sprite_outline.tres b/godot/shared/items/sprite_outline.tres similarity index 100% rename from shared/items/sprite_outline.tres rename to godot/shared/items/sprite_outline.tres diff --git a/shared/shaders/blur.gdshader b/godot/shared/shaders/blur.gdshader similarity index 100% rename from shared/shaders/blur.gdshader rename to godot/shared/shaders/blur.gdshader diff --git a/shared/shaders/hit.gdshader b/godot/shared/shaders/hit.gdshader similarity index 100% rename from shared/shaders/hit.gdshader rename to godot/shared/shaders/hit.gdshader diff --git a/shared/shaders/outline.gdshader b/godot/shared/shaders/outline.gdshader similarity index 100% rename from shared/shaders/outline.gdshader rename to godot/shared/shaders/outline.gdshader diff --git a/src/game.tscn b/godot/src/game.tscn similarity index 100% rename from src/game.tscn rename to godot/src/game.tscn diff --git a/src/menu/AudioSettings.gd b/godot/src/menu/AudioSettings.gd similarity index 100% rename from src/menu/AudioSettings.gd rename to godot/src/menu/AudioSettings.gd diff --git a/src/menu/InputSetting.gd b/godot/src/menu/InputSetting.gd similarity index 100% rename from src/menu/InputSetting.gd rename to godot/src/menu/InputSetting.gd diff --git a/src/menu/Options.gd b/godot/src/menu/Options.gd similarity index 100% rename from src/menu/Options.gd rename to godot/src/menu/Options.gd diff --git a/src/menu/Options.tscn b/godot/src/menu/Options.tscn similarity index 100% rename from src/menu/Options.tscn rename to godot/src/menu/Options.tscn diff --git a/src/menu/Pause.gd b/godot/src/menu/Pause.gd similarity index 100% rename from src/menu/Pause.gd rename to godot/src/menu/Pause.gd diff --git a/src/menu/Pause.tscn b/godot/src/menu/Pause.tscn similarity index 100% rename from src/menu/Pause.tscn rename to godot/src/menu/Pause.tscn diff --git a/src/menu/PauseRoot.gd b/godot/src/menu/PauseRoot.gd similarity index 100% rename from src/menu/PauseRoot.gd rename to godot/src/menu/PauseRoot.gd diff --git a/theme/jackeyfont.ttf b/godot/theme/jackeyfont.ttf similarity index 100% rename from theme/jackeyfont.ttf rename to godot/theme/jackeyfont.ttf diff --git a/theme/jackeyfont.ttf.import b/godot/theme/jackeyfont.ttf.import similarity index 100% rename from theme/jackeyfont.ttf.import rename to godot/theme/jackeyfont.ttf.import diff --git a/theme/theme.scss b/godot/theme/theme.scss similarity index 100% rename from theme/theme.scss rename to godot/theme/theme.scss diff --git a/theme/theme.tres b/godot/theme/theme.tres similarity index 100% rename from theme/theme.tres rename to godot/theme/theme.tres diff --git a/scripts/.gdignore b/scripts/.gdignore deleted file mode 100644 index 8b13789..0000000 --- a/scripts/.gdignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/scripts/build-channel.sh b/scripts/build-channel.sh index b465592..458eecc 100644 --- a/scripts/build-channel.sh +++ b/scripts/build-channel.sh @@ -1,8 +1,10 @@ #!/bin/sh CHANNEL=${CHANNEL:-$1} +VERSION=${$2:-dev} # mkdir ~/.config # cp /root/.config/godot ~/.config -r +cd godot mkdir -v -p build/$CHANNEL godot --export $CHANNEL \ No newline at end of file diff --git a/scripts/combine-sprites.sh b/scripts/combine-sprites.sh index e87ac16..5548953 100644 --- a/scripts/combine-sprites.sh +++ b/scripts/combine-sprites.sh @@ -1,3 +1,3 @@ #!/bin/sh -python ./scripts/anim_combine.py -d ./_sprites -o ./assets -c 10 \ No newline at end of file +python ./scripts/anim_combine.py -d ./_sprites -o ./godot/assets -c 10 \ No newline at end of file diff --git a/theme/generate-theme.sh b/scripts/generate-theme.sh similarity index 93% rename from theme/generate-theme.sh rename to scripts/generate-theme.sh index 60fd2e3..de78ffa 100644 --- a/theme/generate-theme.sh +++ b/scripts/generate-theme.sh @@ -1,4 +1,5 @@ #!/bin/sh +cd godot sass theme/theme.scss theme/theme.css godot -s addons/godot-css-theme/convert.gd --input="res://theme/theme.css" \ No newline at end of file diff --git a/scripts/init-template.sh b/scripts/init-template.sh index 34366a9..a60e0d1 100644 --- a/scripts/init-template.sh +++ b/scripts/init-template.sh @@ -6,7 +6,7 @@ if [ -z $GAME_NAME ]; then fi echo "Setting game name to $GAME_NAME" -sed -e "/config\/name/ s/\".*\"/\"$GAME_NAME\"/" -i project.godot +sed -e "/config\/name/ s/\".*\"/\"$GAME_NAME\"/" -i godot/project.godot sed -e "/GAME=/ s/\".*\"/\"$GAME_NAME\"/" -i scripts/publish.sh # sed -i "s/##VAR_GAME_NAME/$GAME_NAME/g" project.godot diff --git a/scripts/publish.sh b/scripts/publish.sh index df483f1..30f7675 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -40,7 +40,7 @@ build_channels() { github_release() { echo "Releasing version $VERSION to github for $CHANNELS" - cd build + cd godot/build mkdir -p gh-releases for CHANNEL in "${CHANNELS[@]}"; do echo "Archiving $CHANNEL" @@ -59,7 +59,7 @@ itch_release() { for CHANNEL in "${CHANNELS[@]}"; do echo "Releasing $CHANNEL" - butler push build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion $VERSION + butler push godot/build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion $VERSION done } diff --git a/addons/i18n/translations.sh b/scripts/translations.sh similarity index 95% rename from addons/i18n/translations.sh rename to scripts/translations.sh index 66f569c..e822cfc 100644 --- a/addons/i18n/translations.sh +++ b/scripts/translations.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIR="addons/i18n" +DIR="godot/addons/i18n" pybabel extract -F "$DIR/babelrc" -k text -k LineEdit/placeholder_text -k tr -k items --no-location -o "$DIR/messages.pot" \ src "$DIR/menu" diff --git a/tools/SpriteAnimTool.gd b/tools/SpriteAnimTool.gd deleted file mode 100644 index c6405a0..0000000 --- a/tools/SpriteAnimTool.gd +++ /dev/null @@ -1,102 +0,0 @@ -@tool -class_name SpriteAnimTool -extends AnimationPlayer - -@export var run: bool : set = execute - -func update(): - pass - -func execute(x): - print("execute") - if not Engine.is_editor_hint(): - print("SpriteAnimTool can only be run in the editor") - return - update() - -func add_animation(builder: Builder) -> void: - var name = builder.name - var start_frame = builder.start_frame - var end_frame = builder.end_frame - var duration = builder.duration - var loop = builder.loop - var discrete = builder.discrete - - var node = builder.node - var property = "frame" - - var lib = get_animation_library("") - if lib == null: - lib = AnimationLibrary.new() - add_animation_library("", lib) - - var anim = Animation.new() - if lib.has_animation(name): - anim = lib.get_animation(name) - else: - lib.add_animation(name, anim) - - anim.loop_mode = loop - anim.length = duration - - var sprite_path = String(owner.get_path_to(get_node(node))) + ":" + property - var existing_track = anim.find_track(sprite_path, Animation.TYPE_VALUE) - if existing_track != -1: - anim.remove_track(existing_track) - - var track = anim.add_track(Animation.TYPE_VALUE) - anim.track_set_path(track, sprite_path) - if discrete: - anim.value_track_set_update_mode(track, Animation.UPDATE_DISCRETE) - - var total_frames = (end_frame - start_frame) + 1 - - var frames = builder.frames - if frames.size() > 0: - total_frames = frames.size() - - var frame_duration = duration / total_frames - for i in range(0, total_frames): - var frame = start_frame + i if frames.size() == 0 else frames[i] - var key = anim.track_insert_key(track, frame_duration * i, i) - anim.track_set_key_value(track, key, frame) - - -class Builder: - var node = "" - var name = "" - var start_frame = 0 - var end_frame = 0 - var frames = [] - - var duration = 1.0 - var loop = true - var discrete = true - - func _init(node): - self.node = node - - func setName(n: String): - self.name = n - return self - - func setRange(start: int, end: int): - self.start_frame = start - self.end_frame = end - return self - - func setDuration(d: float): - self.duration = d - return self - - func setLoop(l: bool): - self.loop = l - return self - - func setDiscrete(d: bool): - self.discrete = d - return self - - func setFrames(f: Array): - self.frames = f - return self