Commit Graph
30 Commits
Author SHA1 Message Date
minggo 7b0b2bc14e Merge branch 'v3.5' into v3.6_merge_v3.5 2022-06-07 15:39:40 +08:00
minggoandGitHub a280d3ba6a Update boost.cmake (#252) 2022-04-25 16:12:53 +08:00
minggoandGitHub 8a702477c1 Merge pull request #251 from minggo/merge_v3.5
Merge v3.5
2022-04-25 14:06:51 +08:00
minggo 9b3fc71c6d Merge branch 'revert_v3.5' into merge_v3.5 2022-04-25 14:01:47 +08:00
minggoandGitHub 705e0e0f59 fix compiling error on android (#242) 2022-04-01 13:37:16 +08:00
minggoandGitHub c6407256aa Update CMakeLists.txt 2022-03-31 11:17:49 +08:00
minggoandGitHub 41cb1f4a5b fix compiling error with swappy on android 2022-03-31 11:00:17 +08:00
minggoandGitHub 6a553d5814 Merge pull request #235 from cocos/v3.5
V3.5
2022-03-29 17:19:25 +08:00
minggoandGitHub cd659ed8ff Merge pull request #216 from cocos-creator/v3.5 2022-01-26 13:56:11 +08:00
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
minggoandGitHub 5d15a6b4f3 Merge pull request #208 from minggo/merge-v3.4.0_native
Merge v3.4.0 native
2022-01-04 15:38:38 +08:00
minggo 995c2a2f02 fix conflict 2022-01-04 15:36:26 +08:00
minggoandGitHub 59a677f1d3 Merge pull request #206 from minggo/merge_v3.4.0
Merge v3.4.0
2021-12-22 10:40:02 +08:00
minggo a9e9f10f0c merge v3.4 2021-12-22 10:37:56 +08:00
minggoandGitHub 27fba2b278 Merge pull request #202 from cocos-creator/3d-gfx
3d gfx
2021-12-16 11:50:37 +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>
2021-09-24 11:48:06 +08:00
minggoandGitHub 87b44a95c4 compile mururhash2 (#186) 2021-09-07 14:45:41 +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
minggoandGitHub 8e3daf142e Merge pull request #182 from cocos-creator/v3.4.0
V3.4.0
2021-08-21 16:36:13 +08:00
minggoandGitHub 61a9b31c19 Merge pull request #180 from cocos-creator/3d-gfx
3d gfx
2021-08-17 10:57:55 +08:00
minggoandGitHub d07165109c Do not compile native_app_glue.c 2020-11-07 17:10:29 +08:00
minggoandGitHub 435895c2f5 Update unzip.h 2020-08-28 11:15:20 +08:00
minggoandGitHub 4fe69eb307 Update tinyxml2.h 2020-08-27 16:46:55 +08:00
minggoandGitHub eab0959367 change namespace from cocos2d to cc (#104) 2020-06-16 10:16:32 +08:00
minggoandGitHub daa6839332 fix compiling error (#102) 2020-06-15 11:23:12 +08:00
minggoandGitHub 74d1a52c73 move pvrsdk out of source folder and update pvrsdk dylib (#78) 2020-03-03 16:06:38 +08:00
minggoandGitHub 27e72fc3b5 update v8 to 7.5.288.30 (#70) 2019-08-30 17:23:22 +08:00
minggoandGitHub 1fd605809b add missing header files for windows (#68) 2019-07-12 16:48:57 +08:00
minggoandGitHub 6f52e1184d Update v8 to 7.5.288.22 (#66)
* update v8 to 7.5.288.22 for iOS/mac

* update v8 header files

* add v8 lib for ios simulator

* update v8 to 7.5

* update v8 to 7.5.288.22 on Android

* use ndk r19b built v8

* add x86 back

* update windows v8 files to 7.5
2019-07-12 09:40:40 +08:00