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

Develop merge v3.8.1
Merge branch 'v3.8.1' into develop-merge-v3.8.1
2023-07-13 14:12:52 +08:00 · 2023-07-13 11:59:22 +08:00 · 2023-07-12 15:16:03 +08:00 · 2023-07-11 18:22:53 +08:00 · 2023-07-11 13:45:30 +08:00 · 2023-07-07 16:51:41 +08:00
14 changed files with 17 additions and 36 deletions
@@ -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;
@@ -6,10 +6,6 @@ declare module 'external:emscripten/spine/spine.wasm.js' {
    export default SpineWasm;
 }

-declare module 'external:emscripten/spine/spine.wasm.fallback.js' {
-    export default SpineWasm;
-}
-
 // tslint:disable
 declare function SpineWasm (moduleOptions?: any): Promise<void>;

@@ -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)
Author	SHA1	Message	Date
minggoandGitHub	7983e5d777	Merge pull request #387 from minggo/develop-merge-v3.8.1 Develop merge v3.8.1	2023-07-13 14:12:52 +08:00
minggo	109587f1dd	Merge branch 'v3.8.1' into develop-merge-v3.8.1	2023-07-13 11:59:22 +08:00
minggoandGitHub	4063971d00	Merge pull request #385 from cocos/v3.8.0 V3.8.0	2023-07-12 15:16:03 +08:00
Santy-WangandGitHub	80ca0b1f3c	update spine wasm for changing skin (#384 )	2023-07-11 18:22:53 +08:00
Santy-WangandGitHub	5fc3b6118c	update spine wasm (#381 )	2023-07-11 13:45:30 +08:00
江战andGitHub	60b1792049	Merge pull request #380 from Canvasfull/v3.8.0-spine-15 update spine wasm & asm fix interface.	2023-07-07 16:51:41 +08:00
Canvas	e24d2a019b	update spine wasm & asm fix interface.	2023-07-07 16:31:43 +08:00
James ChenandGitHub	53b03aa1de	Update spine, build it on Mac to resolve low FPS (#379 )	2023-07-06 17:32:33 +08:00
Ling ZhanandGitHub	4296d772c0	bullet wasm update (#378 )	2023-07-04 18:31:15 +08:00
minggoandGitHub	8bfff93881	Merge pull request #377 from cocos/v3.8.0 V3.8.0	2023-07-03 14:29:57 +08:00
CanvasandGitHub	40df568df1	fix spine animation editor display exception. (#376 )	2023-07-02 20:19:36 +08:00
zhakesiandGitHub	2a80c4c6db	update spine wasm (#375 )	2023-06-30 14:59:08 +08:00
zhakesiandGitHub	6e292f061a	update spine wasm (#374 )	2023-06-30 14:45:08 +08:00
James ChenandGitHub	e1ee5ad00a	Update swig to v1.1.5, fix https://github.com/cocos/cocos-engine/issues/15583 (#373 )	2023-06-30 10:36:46 +08:00