Merge pull request #387 from minggo/develop-merge-v3.8.1

Develop merge v3.8.1
cocos · Jul 13, 2023 · 7983e5d · 7983e5d
2 parents 6e292f0 + 109587f
commit 7983e5d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/emscripten/bullet/bullet.asm.js b/emscripten/bullet/bullet.asm.js
diff --git 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;

diff --git a/emscripten/bullet/bullet.wasm b/emscripten/bullet/bullet.wasm
diff --git a/emscripten/spine/spine.asm.js b/emscripten/spine/spine.asm.js
diff --git a/emscripten/spine/spine.js.mem b/emscripten/spine/spine.js.mem
diff --git a/emscripten/spine/spine.wasm b/emscripten/spine/spine.wasm
diff --git a/emscripten/spine/spine.wasm.js b/emscripten/spine/spine.wasm.js
diff --git a/linux/bin/swig/bin/swig b/linux/bin/swig/bin/swig
diff --git a/mac/bin/swig/bin/swig b/mac/bin/swig/bin/swig
diff --git 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)
diff --git a/win64/bin/swig/bin/swig.exe b/win64/bin/swig/bin/swig.exe