move to godot folder

sakkaku-dev · Jun 17, 2023 · e8b93b8 · e8b93b8
1 parent f4a723a
commit e8b93b8
Show file tree

Hide file tree

Showing 106 changed files with 17 additions and 141 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/addons/debug/prepare-build.sh b/addons/debug/prepare-build.sh
diff --git a/.gutconfig.json → godot/.gutconfig.json b/.gutconfig.json → godot/.gutconfig.json
diff --git a/addons/debug/Build.gd → godot/addons/debug/Build.gd b/addons/debug/Build.gd → godot/addons/debug/Build.gd
diff --git a/addons/debug/Debug.gd → godot/addons/debug/Debug.gd b/addons/debug/Debug.gd → godot/addons/debug/Debug.gd
diff --git a/addons/debug/Debug.tscn → godot/addons/debug/Debug.tscn b/addons/debug/Debug.tscn → godot/addons/debug/Debug.tscn
diff --git a/addons/debug/Env.gd → godot/addons/debug/Env.gd b/addons/debug/Env.gd → godot/addons/debug/Env.gd
diff --git a/addons/debug/Logger.gd → godot/addons/debug/Logger.gd b/addons/debug/Logger.gd → godot/addons/debug/Logger.gd
diff --git a/addons/debug/README.md → godot/addons/debug/README.md b/addons/debug/README.md → godot/addons/debug/README.md
diff --git a/addons/godot-css-theme/ArgumentParser.gd → .../addons/godot-css-theme/ArgumentParser.gd b/addons/godot-css-theme/ArgumentParser.gd → .../addons/godot-css-theme/ArgumentParser.gd
diff --git a/addons/godot-css-theme/CSSParser.gd → godot/addons/godot-css-theme/CSSParser.gd b/addons/godot-css-theme/CSSParser.gd → godot/addons/godot-css-theme/CSSParser.gd
diff --git a/addons/godot-css-theme/CSSSimplifier.gd → ...t/addons/godot-css-theme/CSSSimplifier.gd b/addons/godot-css-theme/CSSSimplifier.gd → ...t/addons/godot-css-theme/CSSSimplifier.gd
diff --git a/addons/godot-css-theme/LICENSE.txt → godot/addons/godot-css-theme/LICENSE.txt b/addons/godot-css-theme/LICENSE.txt → godot/addons/godot-css-theme/LICENSE.txt
diff --git a/addons/godot-css-theme/Options.gd → godot/addons/godot-css-theme/Options.gd b/addons/godot-css-theme/Options.gd → godot/addons/godot-css-theme/Options.gd
diff --git a/addons/godot-css-theme/Stylesheet.gd → godot/addons/godot-css-theme/Stylesheet.gd b/addons/godot-css-theme/Stylesheet.gd → godot/addons/godot-css-theme/Stylesheet.gd
diff --git a/addons/godot-css-theme/ThemeApplier.gd → godot/addons/godot-css-theme/ThemeApplier.gd b/addons/godot-css-theme/ThemeApplier.gd → godot/addons/godot-css-theme/ThemeApplier.gd
diff --git a/addons/godot-css-theme/convert.gd → godot/addons/godot-css-theme/convert.gd b/addons/godot-css-theme/convert.gd → godot/addons/godot-css-theme/convert.gd
diff --git a/addons/godot-css-theme/optparse.gd → godot/addons/godot-css-theme/optparse.gd b/addons/godot-css-theme/optparse.gd → godot/addons/godot-css-theme/optparse.gd
diff --git a/addons/godot-css-theme/plugin.cfg → godot/addons/godot-css-theme/plugin.cfg b/addons/godot-css-theme/plugin.cfg → godot/addons/godot-css-theme/plugin.cfg
diff --git a/addons/godot-css-theme/plugin.gd → godot/addons/godot-css-theme/plugin.gd b/addons/godot-css-theme/plugin.gd → godot/addons/godot-css-theme/plugin.gd
diff --git a/addons/i18n/README.md → godot/addons/i18n/README.md b/addons/i18n/README.md → godot/addons/i18n/README.md
diff --git a/addons/i18n/babelrc → godot/addons/i18n/babelrc b/addons/i18n/babelrc → godot/addons/i18n/babelrc
diff --git a/addons/i18n/de.po → godot/addons/i18n/de.po b/addons/i18n/de.po → godot/addons/i18n/de.po
diff --git a/addons/i18n/en.po → godot/addons/i18n/en.po b/addons/i18n/en.po → godot/addons/i18n/en.po
diff --git a/addons/i18n/menu/LanguageSelect.gd → godot/addons/i18n/menu/LanguageSelect.gd b/addons/i18n/menu/LanguageSelect.gd → godot/addons/i18n/menu/LanguageSelect.gd
diff --git a/addons/i18n/menu/LanguageSelect.tscn → godot/addons/i18n/menu/LanguageSelect.tscn b/addons/i18n/menu/LanguageSelect.tscn → godot/addons/i18n/menu/LanguageSelect.tscn
diff --git a/addons/i18n/messages.mo → godot/addons/i18n/messages.mo b/addons/i18n/messages.mo → godot/addons/i18n/messages.mo
diff --git a/addons/i18n/messages.pot → godot/addons/i18n/messages.pot b/addons/i18n/messages.pot → godot/addons/i18n/messages.pot
diff --git a/addons/i18n/requirements.txt → godot/addons/i18n/requirements.txt b/addons/i18n/requirements.txt → godot/addons/i18n/requirements.txt
diff --git a/addons/input-system/DeviceSwitcher.gd → godot/addons/input-system/DeviceSwitcher.gd b/addons/input-system/DeviceSwitcher.gd → godot/addons/input-system/DeviceSwitcher.gd
diff --git a/addons/input-system/InputReader.gd → godot/addons/input-system/InputReader.gd b/addons/input-system/InputReader.gd → godot/addons/input-system/InputReader.gd
diff --git a/addons/input-system/InputType.gd → godot/addons/input-system/InputType.gd b/addons/input-system/InputType.gd → godot/addons/input-system/InputType.gd
diff --git a/addons/input-system/PlayerInput.gd → godot/addons/input-system/PlayerInput.gd b/addons/input-system/PlayerInput.gd → godot/addons/input-system/PlayerInput.gd
diff --git a/addons/input-system/README.md → godot/addons/input-system/README.md b/addons/input-system/README.md → godot/addons/input-system/README.md
diff --git a/addons/input-system/TouchReader.gd → godot/addons/input-system/TouchReader.gd b/addons/input-system/TouchReader.gd → godot/addons/input-system/TouchReader.gd
diff --git a/addons/menu-system/AudioSlider.gd → godot/addons/menu-system/AudioSlider.gd b/addons/menu-system/AudioSlider.gd → godot/addons/menu-system/AudioSlider.gd
diff --git a/addons/menu-system/Menu.gd → godot/addons/menu-system/Menu.gd b/addons/menu-system/Menu.gd → godot/addons/menu-system/Menu.gd
diff --git a/addons/menu-system/README.md → godot/addons/menu-system/README.md b/addons/menu-system/README.md → godot/addons/menu-system/README.md
diff --git a/addons/menu-system/RemapButton.gd → godot/addons/menu-system/RemapButton.gd b/addons/menu-system/RemapButton.gd → godot/addons/menu-system/RemapButton.gd
diff --git a/addons/menu-system/RemapButton.tscn → godot/addons/menu-system/RemapButton.tscn b/addons/menu-system/RemapButton.tscn → godot/addons/menu-system/RemapButton.tscn
diff --git a/addons/save-system/CacheManager.gd → godot/addons/save-system/CacheManager.gd b/addons/save-system/CacheManager.gd → godot/addons/save-system/CacheManager.gd
diff --git a/addons/save-system/CacheProperties.gd → godot/addons/save-system/CacheProperties.gd b/addons/save-system/CacheProperties.gd → godot/addons/save-system/CacheProperties.gd
diff --git a/addons/save-system/README.md → godot/addons/save-system/README.md b/addons/save-system/README.md → godot/addons/save-system/README.md
diff --git a/addons/save-system/SaveManager.gd → godot/addons/save-system/SaveManager.gd b/addons/save-system/SaveManager.gd → godot/addons/save-system/SaveManager.gd
diff --git a/addons/scene-manager/README.md → godot/addons/scene-manager/README.md b/addons/scene-manager/README.md → godot/addons/scene-manager/README.md
diff --git a/addons/scene-manager/SceneManager.gd → godot/addons/scene-manager/SceneManager.gd b/addons/scene-manager/SceneManager.gd → godot/addons/scene-manager/SceneManager.gd
diff --git a/addons/scene-manager/SceneManager.tscn → godot/addons/scene-manager/SceneManager.tscn b/addons/scene-manager/SceneManager.tscn → godot/addons/scene-manager/SceneManager.tscn
diff --git a/addons/scene-manager/Transition.gdshader → .../addons/scene-manager/Transition.gdshader b/addons/scene-manager/Transition.gdshader → .../addons/scene-manager/Transition.gdshader
diff --git a/.../scene-manager/shader_patterns/circle.png → .../scene-manager/shader_patterns/circle.png b/.../scene-manager/shader_patterns/circle.png → .../scene-manager/shader_patterns/circle.png
diff --git a/...manager/shader_patterns/circle.png.import → ...manager/shader_patterns/circle.png.import b/...manager/shader_patterns/circle.png.import → ...manager/shader_patterns/circle.png.import
diff --git a/...cene-manager/shader_patterns/curtains.png → ...cene-manager/shader_patterns/curtains.png b/...cene-manager/shader_patterns/curtains.png → ...cene-manager/shader_patterns/curtains.png
diff --git a/...nager/shader_patterns/curtains.png.import → ...nager/shader_patterns/curtains.png.import b/...nager/shader_patterns/curtains.png.import → ...nager/shader_patterns/curtains.png.import
diff --git a/...cene-manager/shader_patterns/diagonal.png → ...cene-manager/shader_patterns/diagonal.png b/...cene-manager/shader_patterns/diagonal.png → ...cene-manager/shader_patterns/diagonal.png
diff --git a/...nager/shader_patterns/diagonal.png.import → ...nager/shader_patterns/diagonal.png.import b/...nager/shader_patterns/diagonal.png.import → ...nager/shader_patterns/diagonal.png.import
diff --git a/...ns/scene-manager/shader_patterns/full.png → ...ns/scene-manager/shader_patterns/full.png b/...ns/scene-manager/shader_patterns/full.png → ...ns/scene-manager/shader_patterns/full.png
diff --git a/...e-manager/shader_patterns/full.png.import → ...e-manager/shader_patterns/full.png.import b/...e-manager/shader_patterns/full.png.import → ...e-manager/shader_patterns/full.png.import
diff --git a/...ne-manager/shader_patterns/horizontal.png → ...ne-manager/shader_patterns/horizontal.png b/...ne-manager/shader_patterns/horizontal.png → ...ne-manager/shader_patterns/horizontal.png
diff --git a/...ger/shader_patterns/horizontal.png.import → ...ger/shader_patterns/horizontal.png.import b/...ger/shader_patterns/horizontal.png.import → ...ger/shader_patterns/horizontal.png.import
diff --git a/.../scene-manager/shader_patterns/radial.png → .../scene-manager/shader_patterns/radial.png b/.../scene-manager/shader_patterns/radial.png → .../scene-manager/shader_patterns/radial.png
diff --git a/...manager/shader_patterns/radial.png.import → ...manager/shader_patterns/radial.png.import b/...manager/shader_patterns/radial.png.import → ...manager/shader_patterns/radial.png.import
diff --git a/...ene-manager/shader_patterns/scribbles.png → ...ene-manager/shader_patterns/scribbles.png b/...ene-manager/shader_patterns/scribbles.png → ...ene-manager/shader_patterns/scribbles.png
diff --git a/...ager/shader_patterns/scribbles.png.import → ...ager/shader_patterns/scribbles.png.import b/...ager/shader_patterns/scribbles.png.import → ...ager/shader_patterns/scribbles.png.import
diff --git a/...scene-manager/shader_patterns/squares.png → ...scene-manager/shader_patterns/squares.png b/...scene-manager/shader_patterns/squares.png → ...scene-manager/shader_patterns/squares.png
diff --git a/...anager/shader_patterns/squares.png.import → ...anager/shader_patterns/squares.png.import b/...anager/shader_patterns/squares.png.import → ...anager/shader_patterns/squares.png.import
diff --git a/...cene-manager/shader_patterns/vertical.png → ...cene-manager/shader_patterns/vertical.png b/...cene-manager/shader_patterns/vertical.png → ...cene-manager/shader_patterns/vertical.png
diff --git a/...nager/shader_patterns/vertical.png.import → ...nager/shader_patterns/vertical.png.import b/...nager/shader_patterns/vertical.png.import → ...nager/shader_patterns/vertical.png.import
diff --git a/assets/.gitkeep → godot/assets/.gitkeep b/assets/.gitkeep → godot/assets/.gitkeep
diff --git a/export_presets.cfg → godot/export_presets.cfg b/export_presets.cfg → godot/export_presets.cfg
diff --git a/icon.svg → godot/icon.svg b/icon.svg → godot/icon.svg
diff --git a/icon.svg.import → godot/icon.svg.import b/icon.svg.import → godot/icon.svg.import
diff --git a/project.godot → godot/project.godot b/project.godot → godot/project.godot
diff --git a/shared/CameraShake.gd → godot/shared/CameraShake.gd b/shared/CameraShake.gd → godot/shared/CameraShake.gd
diff --git a/shared/FrameFreeze.gd → godot/shared/FrameFreeze.gd b/shared/FrameFreeze.gd → godot/shared/FrameFreeze.gd
diff --git a/shared/SoftCollision.gd → godot/shared/SoftCollision.gd b/shared/SoftCollision.gd → godot/shared/SoftCollision.gd
diff --git a/shared/effect/Effect.gd → godot/shared/effect/Effect.gd b/shared/effect/Effect.gd → godot/shared/effect/Effect.gd
diff --git a/shared/effect/FadeEffect.gd → godot/shared/effect/FadeEffect.gd b/shared/effect/FadeEffect.gd → godot/shared/effect/FadeEffect.gd
diff --git a/shared/effect/PositionEffect.gd → godot/shared/effect/PositionEffect.gd b/shared/effect/PositionEffect.gd → godot/shared/effect/PositionEffect.gd
diff --git a/shared/items/Hand.gd → godot/shared/items/Hand.gd b/shared/items/Hand.gd → godot/shared/items/Hand.gd
diff --git a/shared/items/Interactable.gd → godot/shared/items/Interactable.gd b/shared/items/Interactable.gd → godot/shared/items/Interactable.gd
diff --git a/shared/items/sprite_outline.tres → godot/shared/items/sprite_outline.tres b/shared/items/sprite_outline.tres → godot/shared/items/sprite_outline.tres
diff --git a/shared/shaders/blur.gdshader → godot/shared/shaders/blur.gdshader b/shared/shaders/blur.gdshader → godot/shared/shaders/blur.gdshader
diff --git a/shared/shaders/hit.gdshader → godot/shared/shaders/hit.gdshader b/shared/shaders/hit.gdshader → godot/shared/shaders/hit.gdshader
diff --git a/shared/shaders/outline.gdshader → godot/shared/shaders/outline.gdshader b/shared/shaders/outline.gdshader → godot/shared/shaders/outline.gdshader
diff --git a/src/game.tscn → godot/src/game.tscn b/src/game.tscn → godot/src/game.tscn
diff --git a/src/menu/AudioSettings.gd → godot/src/menu/AudioSettings.gd b/src/menu/AudioSettings.gd → godot/src/menu/AudioSettings.gd
diff --git a/src/menu/InputSetting.gd → godot/src/menu/InputSetting.gd b/src/menu/InputSetting.gd → godot/src/menu/InputSetting.gd
diff --git a/src/menu/Options.gd → godot/src/menu/Options.gd b/src/menu/Options.gd → godot/src/menu/Options.gd
diff --git a/src/menu/Options.tscn → godot/src/menu/Options.tscn b/src/menu/Options.tscn → godot/src/menu/Options.tscn
diff --git a/src/menu/Pause.gd → godot/src/menu/Pause.gd b/src/menu/Pause.gd → godot/src/menu/Pause.gd
diff --git a/src/menu/Pause.tscn → godot/src/menu/Pause.tscn b/src/menu/Pause.tscn → godot/src/menu/Pause.tscn
diff --git a/src/menu/PauseRoot.gd → godot/src/menu/PauseRoot.gd b/src/menu/PauseRoot.gd → godot/src/menu/PauseRoot.gd
diff --git a/theme/jackeyfont.ttf → godot/theme/jackeyfont.ttf b/theme/jackeyfont.ttf → godot/theme/jackeyfont.ttf
diff --git a/theme/jackeyfont.ttf.import → godot/theme/jackeyfont.ttf.import b/theme/jackeyfont.ttf.import → godot/theme/jackeyfont.ttf.import
diff --git a/theme/theme.scss → godot/theme/theme.scss b/theme/theme.scss → godot/theme/theme.scss
diff --git a/theme/theme.tres → godot/theme/theme.tres b/theme/theme.tres → godot/theme/theme.tres
diff --git a/scripts/.gdignore b/scripts/.gdignore
diff --git 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
diff --git 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
+python ./scripts/anim_combine.py -d ./_sprites -o ./godot/assets -c 10
diff --git a/theme/generate-theme.sh → scripts/generate-theme.sh b/theme/generate-theme.sh → 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"
diff --git 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
@@ -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 → scripts/translations.sh b/addons/i18n/translations.sh → 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