diff --git a/.github/workflows/dev-clickable-builds.yml b/.github/workflows/dev-clickable-builds.yml index 96ff6102217c..1f2c2f91653f 100644 --- a/.github/workflows/dev-clickable-builds.yml +++ b/.github/workflows/dev-clickable-builds.yml @@ -10,7 +10,7 @@ on: - "installer/po/*" env: - GODOT_VERSION: 3.4 + GODOT_VERSION: 3.4.2 EXPORT_NAME: Pixelorama jobs: @@ -18,7 +18,7 @@ jobs: name: Create Pixelorama pack data runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Clone source uses: actions/checkout@v2 diff --git a/.github/workflows/dev-desktop-builds.yml b/.github/workflows/dev-desktop-builds.yml index 21ad7295d395..4cfa66567062 100644 --- a/.github/workflows/dev-desktop-builds.yml +++ b/.github/workflows/dev-desktop-builds.yml @@ -11,8 +11,8 @@ on: - "installer/po/*" env: - GODOT_VERSION: 3.4 - GODOT_VERSION_MAC: 3.4 + GODOT_VERSION: 3.4.2 + GODOT_VERSION_MAC: 3.4.2 EXPORT_NAME: Pixelorama jobs: @@ -20,7 +20,7 @@ jobs: name: Windows Export 🗔 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Setup WINE and rcedit 🍷 run: | @@ -57,7 +57,7 @@ jobs: name: Linux Export 🐧 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 @@ -69,7 +69,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Download Unofficial Godot Raspberry Pi 4 Builds 🍇 run: | - wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.7.0/godot_${GODOT_VERSION}-stable_rpi4.zip + wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.9.0/godot_${GODOT_VERSION}-stable_rpi4.zip unzip -a godot_${GODOT_VERSION}-stable_rpi4.zip - name: Linux Build 🔧 run: | diff --git a/.github/workflows/dev-web.yml b/.github/workflows/dev-web.yml index 08ddd0ce381e..9c5330348cdb 100644 --- a/.github/workflows/dev-web.yml +++ b/.github/workflows/dev-web.yml @@ -5,7 +5,7 @@ on: branches: [ master ] env: - GODOT_VERSION: 3.4 + GODOT_VERSION: 3.4.2 EXPORT_NAME: Pixelorama jobs: @@ -13,7 +13,7 @@ jobs: name: Web Export 🌐 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51cfffe76867..0d2fe7d5b16e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,8 +5,8 @@ on: branches: [ release ] env: - GODOT_VERSION: 3.4 - GODOT_VERSION_MAC: 3.4 + GODOT_VERSION: 3.4.2 + GODOT_VERSION_MAC: 3.4.2 EXPORT_NAME: Pixelorama TAG: v0.9.1 BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }} @@ -16,7 +16,7 @@ jobs: name: Windows Export 🗔 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Setup WINE, rcedit and NSIS 🍷 run: | @@ -73,7 +73,7 @@ jobs: name: Linux Export 🐧 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 @@ -85,7 +85,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Download Unofficial Godot Raspberry Pi 4 Builds 🍇 run: | - wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.7.0/godot_${GODOT_VERSION}-stable_rpi4.zip + wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.9.0/godot_${GODOT_VERSION}-stable_rpi4.zip unzip -a godot_${GODOT_VERSION}-stable_rpi4.zip - name: Linux Build 🔧 run: | @@ -127,7 +127,7 @@ jobs: name: Create Pixelorama pack data for Clickable runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Clone source uses: actions/checkout@v2 @@ -252,7 +252,7 @@ jobs: name: Web Export 🌐 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4 + image: docker://barichello/godot-ci:3.4.2 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 diff --git a/export_presets.cfg b/export_presets.cfg index 64a918dcafc6..c19d1a2e2097 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -239,7 +239,7 @@ script_encryption_key="" [preset.7.options] custom_template/debug="" -custom_template/release="./godot_3.4-stable_rpi4_export-template_lto.bin" +custom_template/release="./godot_3.4.2-stable_rpi4_export-template_lto.bin" binary_format/64_bits=false binary_format/embed_pck=false texture_format/bptc=false diff --git a/project.godot b/project.godot index 6a5cbbf09960..d0f7bfec921b 100644 --- a/project.godot +++ b/project.godot @@ -180,8 +180,6 @@ window/per_pixel_transparency/allowed=true window/per_pixel_transparency/enabled=true window/per_pixel_transparency/allowed.HTML5=false window/per_pixel_transparency/enabled.HTML5=false -window/per_pixel_transparency/allowed.OSX=false -window/per_pixel_transparency/enabled.OSX=false window/per_pixel_transparency/allowed.Android=false window/per_pixel_transparency/enabled.Android=false