Merge branch 'v3.8.1' into develop-merge-v3.8.1

2023-07-13 11:59:22 +08:00 · 2023-07-13 11:59:22 +08:00 · 109587f1dd
parent 6e292f061a 4063971d00
commit 109587f1dd
11 changed files with 17 additions and 16 deletions
--- a/emscripten/bullet/bullet.asm.js
+++ b/emscripten/bullet/bullet.asm.js
--- a/emscripten/bullet/bullet.d.ts
+++ b/emscripten/bullet/bullet.d.ts
@ -255,6 +255,7 @@ declare namespace Bullet {
        // CharacterController
        ControllerHitReport_new(): ptr;
        CharacterController_getGhostObject(ptrCCT: ptr): ptr;
+        CharacterController_getCollisionShape(ptrCCT: ptr): ptr;
        ControllerHit_getCurrentController(p: ptr): ptr;
        ControllerHit_getHitWorldPos(p: ptr): ptr;
        ControllerHit_getHitWorldNormal(p: ptr): ptr;
--- a/emscripten/bullet/bullet.wasm
+++ b/emscripten/bullet/bullet.wasm
--- a/emscripten/spine/spine.asm.js
+++ b/emscripten/spine/spine.asm.js
--- a/emscripten/spine/spine.js.mem
+++ b/emscripten/spine/spine.js.mem
--- a/emscripten/spine/spine.wasm
+++ b/emscripten/spine/spine.wasm
--- a/emscripten/spine/spine.wasm.js
+++ b/emscripten/spine/spine.wasm.js
--- a/linux/bin/swig/bin/swig
+++ b/linux/bin/swig/bin/swig
--- a/mac/bin/swig/bin/swig
+++ b/mac/bin/swig/bin/swig
--- a/versions.txt
+++ b/versions.txt
@ -139,7 +139,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
    linux:      11.5.0
    openharmony:11.5.0 (commit: 1978c76)
    
-swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.4 )
-    win64:      cocos-v1.1.4 (commit: 9807544)
-    mac:        cocos-v1.1.4 (commit: 9807544)
-    linux:      cocos-v1.1.4 (commit: 9807544)
+swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.5 )
+    win64:      cocos-v1.1.5 (commit: 42543c0)
+    mac:        cocos-v1.1.5 (commit: 42543c0)
+    linux:      cocos-v1.1.5 (commit: 42543c0)
--- a/win64/bin/swig/bin/swig.exe
+++ b/win64/bin/swig/bin/swig.exe