Use Godot 3.4.2 and re-enable window transparency on macOS

Orama-Interactive · Jan 3, 2022 · 500a482 · 500a482
1 parent 8f701df
commit 500a482
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/dev-clickable-builds.yml b/.github/workflows/dev-clickable-builds.yml
@@ -10,15 +10,15 @@ on:
     - "installer/po/*"
 
 env:
-  GODOT_VERSION: 3.4
+  GODOT_VERSION: 3.4.2
   EXPORT_NAME: Pixelorama
 
 jobs:
   build_pck:
     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
@@ -11,16 +11,16 @@ 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:
   export-windows:
     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
@@ -5,15 +5,15 @@ on:
     branches: [ master ]
 
 env:
-  GODOT_VERSION: 3.4
+  GODOT_VERSION: 3.4.2
   EXPORT_NAME: Pixelorama
 
 jobs:
   export-web:
     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
@@ -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
@@ -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
@@ -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