Commit Graph
273 Commits
Author SHA1 Message Date
minggoandGitHub 3cb6ea1f12 Merge branch 'v3.6' into v3.5 2022-01-26 13:55:53 +08:00
minggoandGitHub 8baf780aa5 Merge pull request #215 from cocos-creator/v3.4.2
V3.4.2
2022-01-26 13:49:25 +08:00
wkpandGitHub 50616c85f9 adapt editor native scene (#214) 2022-01-26 13:45:58 +08:00
Yun Hsiao WuandGitHub 937d14d529 better boost source cmake (#213) 2022-01-24 17:47:48 +08:00
bofeng-songandGitHub 89a9602367 supports to generate editor`s uuid (#212) v3d-gfx-90 2022-01-17 18:18:09 +08:00
yangchaoandGitHub 613927e7f7 add Linux libs (#211)
* add linux lib

* add sdl2

* remove files

* new lib dir

* change cmake

* add qnx lib

* add cairo lib

* openssl use 1.1.1k , curl use static link
v3d-gfx-89
2022-01-10 11:06:44 +08:00
timlyeeeandGitHub fbef7505d9 mpg123 fix (#210) v3d-gfx-88 2022-01-07 17:33:25 +08:00
minggoandGitHub 5d15a6b4f3 Merge pull request #208 from minggo/merge-v3.4.0_native
Merge v3.4.0 native
v3d-gfx-86
2022-01-04 15:38:38 +08:00
minggo 995c2a2f02 fix conflict 2022-01-04 15:36:26 +08:00
Zeqiang LiandGitHub bcdb8327ef 3.4 wgpu wasm (#207) 2021-12-29 16:41:57 +08:00
minggoandGitHub 59a677f1d3 Merge pull request #206 from minggo/merge_v3.4.0
Merge v3.4.0
v3d-gfx-87
2021-12-22 10:40:02 +08:00
minggo a9e9f10f0c merge v3.4 2021-12-22 10:37:56 +08:00
Yun Hsiao WuandGitHub 1aac2fcd8d update boost & add container lib (#204)
* remove boost headers

* boost 1.78
v3d-gfx-85
2021-12-16 11:57:40 +08:00
Yun Hsiao WuandGitHub a52c3279c3 revert link order adjustment (#201)
The new order will lead to compilation failures when running 32-bit app
on 64-bit devices. /eyerolling
v3d-gfx-84
2021-12-16 11:51:30 +08:00
minggoandGitHub 27fba2b278 Merge pull request #202 from cocos-creator/3d-gfx
3d gfx
2021-12-16 11:50:37 +08:00
江战andGitHub 7644ec1a9e Merge pull request #199 from PatriceJiang/v3.4.0-fix-android-compile-every-time
3.4 skip modifying header file of pvmp3dec
v3d-gfx-83
2021-12-08 09:40:25 +08:00
PatriceJiang 101f8e780c skip change header file of pvmp3dec 2021-12-08 09:36:41 +08:00
Yun Hsiao WuandGitHub 4f972469ff fix glslang link order (#198) v3d-gfx-82 2021-11-12 11:46:34 +08:00
mmyduckxandGitHub 7b043c5a76 Add m1 physX support & Stripp PhysX lib for mac/ios/android (#197)
* add M1 arch PhysX & strip & make fatlib

* strip for iOS PhysX

* strip for Android PhysX
v3d-gfx-81
2021-11-09 18:06:59 +08:00
timlyeeeandGitHub acbdb6702b Disable cxx exceptions for spirv-tools (#196)
https://github.com/cocos-creator/3d-tasks/issues/9154
v3d-gfx-80
2021-10-21 15:34:42 +08:00
Yun Hsiao WuandGitHub 2fc0d39b14 use older pvrvframe library (#195)
which does not suffer from the mandatory multisampled back buffer issue from egl.
v3d-gfx-79
2021-10-20 17:25:48 +08:00
timlyeeeandGitHub b13e0d8b6f Fix ios compile error (#194)
* remove libSPVRemapper dependency
v3d-gfx-78
2021-09-30 09:07:12 +08:00
timlyeeeandGitHub 3394d82bd6 Fix x64 websocket issue (#193) v3d-gfx-77 2021-09-28 11:51:56 +08:00
c062a38ab9 merge 3.3.2 (#192)
* Fix issue (#190)

https://github.com/cocos-creator/3d-tasks/issues/9185

* spirv cross for ios 10.0 (#191)

Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>

Co-authored-by: timlyeee <43355299+timlyeee@users.noreply.github.com>
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
v3d-gfx-76
2021-09-24 11:48:06 +08:00
f7a71ec36a spirv cross for ios 10.0 (#191)
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
3d-v3.3.2 v3d-gfx-75
2021-09-17 11:15:54 +08:00
timlyeeeandGitHub 756cbedc19 Fix issue (#190)
https://github.com/cocos-creator/3d-tasks/issues/9185
v3d-gfx-74
2021-09-16 10:40:50 +08:00
江战andGitHub e3f45c9eb5 Merge pull request #189 from mmyduckx/win32-v8-update
update win32 v8 to 9.1.269
v3.4.0-2
2021-09-14 09:30:28 +08:00
mmyduckx aa94102f24 update win32 v8 to 9.1.269 2021-09-13 20:22:56 +08:00
江战andGitHub be01550e33 Merge pull request #188 from mmyduckx/fix-ios-v8
fix ios cmake
v3.4.0-1
2021-09-13 18:34:05 +08:00
mmyduckx cae65370a7 fix ios cmake 2021-09-10 11:48:16 +08:00
江战andGitHub d92f7157f7 Merge pull request #187 from mmyduckx/v8-9.1.269
update v8 to 9.1.269 for mac/ios/android/ohos
v3d-gfx-73
2021-09-10 10:39:42 +08:00
mmyduckx b9d9873d98 update v8 to 9.1.269 for mac/ios/android/ohos 2021-09-09 19:48:05 +08:00
minggoandGitHub 87b44a95c4 compile mururhash2 (#186) 2021-09-07 14:45:41 +08:00
timlyeeeandGitHub 91ced4772c Add msvcr dynamic library (#185)
* Add msvcr dynamic library

Issue: https://github.com/cocos-creator/3d-tasks/issues/8920
* msvcr110 is Microsoft Visual C++ Redistributable 2012
* msvcr120 is Microsoft Visual C++ Redistributable 2013
* MSVCP140(D).dll, vcruntime(d).dll is in Microsoft Visual C++ Redistributable 2015
Simulator usually runs on Win32 platform so no need for x64. And x64 platform runs without msvcr110+

* add x64

* Revert "Add msvcr dynamic library"

This reverts commit f5c8d60d05.
v3d-gfx-72
2021-09-07 10:20:05 +08:00
minggoandGitHub fe4497e75f Merge pull request #183 from dumganhar/v3.3.0-native
Add MurmurHash2.h/.cpp
2021-08-26 13:53:01 +08:00
dumganhar 5215773c23 Add MurmurHash2.h/.cpp 2021-08-25 16:26:37 +08:00
minggoandGitHub 8e3daf142e Merge pull request #182 from cocos-creator/v3.4.0
V3.4.0
2021-08-21 16:36:13 +08:00
James ChenandGitHub 00dee102a5 Add rapidjson v1.1.0 source code. (#181)
* Delete mac specific temp file: .DS_Store.

* Update .gitignore.

* Add rapidjson source code.
2021-08-21 11:29:26 +08:00
minggoandGitHub 61a9b31c19 Merge pull request #180 from cocos-creator/3d-gfx
3d gfx
v3d-gfx-71
2021-08-17 10:57:55 +08:00
05bf167704 vk use tbb but tbbmalloc (#179)
Co-authored-by: lijilin <jilin.li@cocos.com>
v3d-gfx-70
2021-08-16 15:40:19 +08:00
f931b3637d Fix spirv issue (#178)
* modify spirv

* update Spirv 

* issue: https://github.com/cocos-creator/3d-tasks/issues/8671

* Update Android

Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
3d-v3.3.1 v3d-gfx-69
2021-08-13 18:43:47 +08:00
timlyeeeandGitHub daaab59d3b Update infomations (#177) v3d-gfx-68 2021-08-12 14:41:06 +08:00
fc76ca7afe add tcmalloc & USE_JOB_SYSTEM_TBB (#172)
Co-authored-by: lijilin <jilin.li@cocos.com>
v3d-gfx-67
2021-08-12 14:32:25 +08:00
timlyeeeandGitHub 06fd753ae8 update opengl-registry api & egl registry api (#176)
* According to the pvr_sdk project, we found that the registry api is already updated, while our engine does not
v3d-gfx-66
2021-08-12 14:24:40 +08:00
江战andGitHub 674cc1fb78 Merge pull request #174 from PatriceJiang/3.3-fix-bindings
bugfix: rename variable
v3d-gfx-65
2021-08-11 15:16:51 +08:00
Arnold c51a7e1c57 fix 2 2021-08-11 15:15:23 +08:00
江战andGitHub 303041611f Merge pull request #173 from PatriceJiang/3.3-fix-bindings
Rename vars
v3d-gfx-64
2021-08-11 14:50:17 +08:00
Arnold 866613b6dd move tea to ccutils 2021-08-11 14:48:23 +08:00
江战andGitHub 29c1e7be47 Merge pull request #171 from timlyeee/v3d-gfx-arm64
add x86_64 glslang for ios
v3d-gfx-63
2021-08-06 10:25:24 +08:00
LX f1aa69a54d add x86_64 glslang for ios 2021-08-06 10:19:40 +08:00