update html5 build

jefersondaniel · Jan 10, 2024 · 543b3f6 · 543b3f6
1 parent bf947ac
commit 543b3f6
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 59 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -3,8 +3,8 @@ name: Build for Android
 on: workflow_dispatch
 
 env:
-  GODOT_VERSION: 3.5.2
-  EXPORT_NAME: neomugen
+  GODOT_VERSION: 3.5.3
+  EXPORT_NAME: mugen
   CARGO_TERM_COLOR: always
   JAVA_VERSION: 1.8
   ANDROID_VERSION: 30
@@ -19,7 +19,7 @@ jobs:
     name: Android export
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.5.2
+      image: barichello/godot-ci:3.5.3
       credentials:
         username: jefersondaniel
         password: ${{ secrets.GHCR_TOKEN }}

diff --git a/.github/workflows/build-html5.yml b/.github/workflows/build-html5.yml
@@ -3,17 +3,17 @@ name: Build for HTML5
 on: workflow_dispatch
 
 env:
-  GODOT_VERSION: 3.5.2
-  EXPORT_NAME: neomugen
+  GODOT_VERSION: 3.5.3
+  EXPORT_NAME: mugen
   CARGO_TERM_COLOR: always
-  EMSDK_VERSION: 3.1.21
+  EMSDK_VERSION: 3.1.14
 
 jobs:
   export-html:
     name: HTML5 export
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.5.2
+      image: barichello/godot-ci:3.5.3
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -45,15 +45,13 @@ jobs:
 
       - name: Compile native lib for wasm
         uses: actions-rs/cargo@v1
+        working-directory: ./source/native
         with:
           toolchain: nightly-2023-11-10
           command: build
-          args: --manifest-path source/native/Cargo.toml --target wasm32-unknown-emscripten --release
+          args: --target wasm32-unknown-emscripten --release
         env:
           C_INCLUDE_PATH: ${{env.EMSDK}}/upstream/emscripten/cache/sysroot/include/
-          RUSTFLAGS: -Zlink-native-libraries=no -Cpanic=abort
-          EMCC_CFLAGS: -s SIDE_MODULE=2 -shared -Os
-          CARGO_TARGET_DIR: source/native/target
 
       - name: Build
         run: |

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -3,16 +3,16 @@ name: Build for Linux
 on: workflow_dispatch
 
 env:
-  GODOT_VERSION: 3.5.2
-  EXPORT_NAME: neomugen
+  GODOT_VERSION: 3.5.3
+  EXPORT_NAME: mugen
   CARGO_TERM_COLOR: always
 
 jobs:
   export-linux:
     name: Linux export
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.5.2
+      image: barichello/godot-ci:3.5.3
       credentials:
         username: jefersondaniel
         password: ${{ secrets.GHCR_TOKEN }}

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -3,8 +3,8 @@ name: Build for MacOS
 on: workflow_dispatch
 
 env:
-  GODOT_VERSION: 3.5.2
-  EXPORT_NAME: neomugen
+  GODOT_VERSION: 3.5.3
+  EXPORT_NAME: mugen
   CARGO_TERM_COLOR: always
   MACOS_SDK_TAR: https://s3.dockerproject.org/darwin/v2/MacOSX10.10.sdk.tar.xz
   MACOS_SDK_VERSION: 10.10
@@ -15,7 +15,7 @@ jobs:
     name: MacOSX export
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.5.2
+      image: barichello/godot-ci:3.5.3
       credentials:
         username: jefersondaniel
         password: ${{ secrets.GHCR_TOKEN }}

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -3,16 +3,16 @@ name: Build for Windows
 on: workflow_dispatch
 
 env:
-  GODOT_VERSION: 3.5.2
-  EXPORT_NAME: neomugen
+  GODOT_VERSION: 3.5.3
+  EXPORT_NAME: mugen
   CARGO_TERM_COLOR: always
 
 jobs:
   export-windows:
     name: Windows export
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.5.2
+      image: barichello/godot-ci:3.5.3
       credentials:
         username: jefersondaniel
         password: ${{ secrets.GHCR_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ resources
 **/*.rs.bk
 *.pdb
 source/native/logs
+exports/
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -7,9 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="data/*,internal.cns"
 exclude_filter="test/*"
-export_path="exports/windows/neomugen.exe"
-script_export_mode=1
-script_encryption_key=""
+export_path="exports/windows/mugen.exe"
 
 [preset.0.options]
 
@@ -48,9 +46,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="data/*,internal.cns"
 exclude_filter="test/*"
-export_path="exports/linux/neomugen"
-script_export_mode=1
-script_encryption_key=""
+export_path="exports/linux/mugen"
 
 [preset.1.options]
 
@@ -73,9 +69,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="data/*,internal.cns"
 exclude_filter="test/*"
-export_path="exports/mac/neomugen"
-script_export_mode=1
-script_encryption_key=""
+export_path="exports/mac/mugen"
 
 [preset.2.options]
 
@@ -105,9 +99,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="data/*,internal.cns"
 exclude_filter="test/*"
-export_path="exports/android/neomugen.apk"
-script_export_mode=1
-script_encryption_key=""
+export_path="exports/android/mugen.apk"
 
 [preset.3.options]
 
@@ -305,9 +297,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="data/*,internal.cns"
 exclude_filter="test/*"
-export_path="exports/web/neomugen.html"
-script_export_mode=1
-script_encryption_key=""
+export_path="exports/web/mugen.html"
 
 [preset.4.options]
 

diff --git a/project.godot b/project.godot
@@ -8,13 +8,19 @@
 
 config_version=4
 
-_global_script_classes=[  ]
+_global_script_classes=[ {
+"base": "Reference",
+"class": "AttackState",
+"language": "GDScript",
+"path": "res://source/gdscript/nodes/character/attack_state.gd"
+} ]
 _global_script_class_icons={
+"AttackState": ""
 }
 
 [application]
 
-config/name="NeoMugen"
+config/name="Mugen"
 run/main_scene="res://source/scenes/main.tscn"
 config/icon="res://icon.png"
 
@@ -35,112 +41,112 @@ window/stretch/aspect="keep"
 
 P1_B={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_F={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_D={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_U={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_a={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":44,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":44,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_b={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":46,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":46,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_c={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":59,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":59,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_x={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":76,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":76,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_y={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":231,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":231,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_z={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":93,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":93,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P1_s={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_B={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_F={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_D={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_U={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_a={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":70,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":70,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_b={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":71,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":71,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_c={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":72,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":72,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_x={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_y={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":84,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":84,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_z={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":89,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":89,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 P2_s={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }