diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b94fda..83706c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,8 +6,8 @@ on: - cron: 0 11 * * * env: - GODOT: Godot_v3.3.2-stable - GODOT_VERSION: 3.3.2 + GODOT: Godot_v3.4.2-stable + GODOT_VERSION: 3.4.2 GODOT_RELEASE: stable # Caches should be automatically invalidated when versions change, @@ -90,9 +90,9 @@ jobs: # JavaScript-specific steps. - name: Install javascript build dependencies if: ${{ matrix.platform == 'javascript' }} - uses: mymindstorm/setup-emsdk@v9 + uses: mymindstorm/setup-emsdk@v11 with: - version: 2.0.10 + version: 3.1.5 actions-cache-folder: emsdk-cache-${{ matrix.target }} # MacOS-specific steps. @@ -261,7 +261,7 @@ jobs: matrix: os: [ windows-latest, macos-latest, ubuntu-latest ] bits: [ 64, 32 ] - godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4-stable' ] + godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.2-stable' ] exclude: - os: macos-latest bits: 32 diff --git a/export_presets.cfg b/export_presets.cfg index d05541e..10a7d1b 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -18,7 +18,17 @@ custom_template/release="./misc/export_templates/godot/bin/webassembly_gdnative_ variant/export_type=2 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" html/head_include="" html/canvas_resize_policy=2 +html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color( 0, 0, 0, 1 ) diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 4aa55fc..ca0c9d8 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -1,4 +1,4 @@ # For convenient building of the library and gdnative export templates targeted at the javacript platform. -FROM emscripten/emsdk:2.0.10 +FROM emscripten/emsdk:3.1.5 RUN apt-get update && apt-get install pkg-config python3 -y RUN pip3 install scons diff --git a/misc/export_templates/godot b/misc/export_templates/godot index 7610409..45eaa2d 160000 --- a/misc/export_templates/godot +++ b/misc/export_templates/godot @@ -1 +1 @@ -Subproject commit 7610409b8a14b8499763efa76578795c755a846d +Subproject commit 45eaa2daf1e3d2571a9f31a3421911262ec82f51