chore: update to godot 4.2 (#38)

utopia-rise · Dec 27, 2023 · 9cd95ef · 9cd95ef
1 parent bc49008
commit 9cd95ef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.github/actions/create-android-export-template/action.yaml b/.github/actions/create-android-export-template/action.yaml
@@ -8,10 +8,10 @@ runs:
   steps:
     - name: Setup Godot dependencies
       uses: ./.github/actions/godot-deps
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Setup Android SDK
       uses: android-actions/setup-android@v2
     - name: Download android ${{ inputs.target }} export armv7 binary

diff --git a/.github/workflows/check-pr-engine-editor-debug.yaml b/.github/workflows/check-pr-engine-editor-debug.yaml
@@ -3,8 +3,8 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 4.1.0
-  GODOT_BASE_BRANCH: 4.1.0
+  GODOT_BASE_VERSION: 4.2.0
+  GODOT_BASE_BRANCH: 4.2.0
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-editor-debug-and-tests
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.1.1-stable
+          ref: 4.2-stable
       - name: Clone Godot Isometric Map module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-engine-export-template-debug.yaml b/.github/workflows/check-pr-engine-export-template-debug.yaml
@@ -3,8 +3,8 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 4.1.0
-  GODOT_BASE_BRANCH: 4.1.0
+  GODOT_BASE_VERSION: 4.2.0
+  GODOT_BASE_BRANCH: 4.2.0
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-debug
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.1.1-stable
+          ref: 4.2-stable
       - name: Clone Godot Isometric Map module.
         uses: actions/checkout@v2
         with:
@@ -122,7 +122,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.1-stable
+          ref: 4.2-stable
       - name: Clone Godot Isometric Map module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-engine-export-template-release.yaml b/.github/workflows/check-pr-engine-export-template-release.yaml
@@ -3,7 +3,7 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 4.1.1
+  GODOT_BASE_VERSION: 4.2.0
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-release
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.1.1-stable
+          ref: 4.2-stable
       - name: Clone Godot Isometric Map module.
         uses: actions/checkout@v2
         with:
@@ -121,7 +121,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.1-stable
+          ref: 4.2-stable
       - name: Clone Godot Isometric Map module.
         uses: actions/checkout@v2
         with:

diff --git a/src/editor/positionable_scenes_cache_manager.cpp b/src/editor/positionable_scenes_cache_manager.cpp
@@ -6,6 +6,7 @@
 #include "utils/isometric_maths.h"
 
 #include <scene/2d/camera_2d.h>
+#include <scene/resources/image_texture.h>
 
 using namespace editor;