Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
964 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

155 Commits

Author SHA1 Message Date
halx99 e9fa3b4dac Merge: 7624df74f3 d20d3fd241 
Merge pull request #111 from halx99/fix-type-error

fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 67ab691c30 fix compile issue 2020-07-10 16:00:21 +08:00
halx99 c93a443f18 Correct feature test when use angle backend 2020-07-10 15:16:44 +08:00
halx99 d61534e359 Improve utf-8 path on win32, explicit call wide version of system API. 2020-07-10 15:14:16 +08:00
halx99 a76af60dbb Adapte glfw-3.4 2020-07-03 11:08:39 +08:00
halx99 44276b824a Merge: 58403292cd bfd1709ab7 
Merge pull request #108 from halx99/master

Optimzie writeStringToFile
 2020-06-14 16:29:40 +08:00
halx99 8f3c82a287 Merge: 80f33f376c 208bc9fe6f 
Merge pull request #107 from halx99/master

Auto copy angle lib to target bin directory
 2020-06-14 16:23:58 +08:00
halx99 7cd562750e Optimzie writeStringToFile 2020-06-14 15:54:55 +08:00
halx99 ef9b96de58 ios don't support thread local storage 2020-06-14 15:52:15 +08:00
halx99 98cb60f8bb fix ios compile error 2020-06-14 13:58:29 +08:00
halx99 489fb1a50a finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 e58b7c292a Support use google angle support on windows. 2020-06-12 12:42:58 +08:00
halx99 db6399f792 Merge: 313d4dc2a1 04ac727c8e 
Merge branch 'master' of https://github.com/halx99/engine-x
 2020-03-03 23:18:14 +08:00
halx99 ecd988d324 Update deps to v33 2020-03-03 23:17:38 +08:00
halx99 f6ff10a8e9 fix ios compile error 2020-03-03 20:05:56 +08:00
halx99 52058861a0 Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 88b7b95b73 Merge: 0c291dd470 f5eac1eede 
Merge pull request #71 from c4games/sync-v3-pull-19256

Sync v3 pr-19256
 2020-02-24 19:52:22 +08:00
halx99 57dd626e39 Fixup, optimize shader compile log. 2020-02-24 16:27:10 +08:00
halx99 77b1f41c85 Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256 2020-02-24 16:22:40 +08:00
halx99 ab322c8641 Sync for glad 2020-02-16 16:44:14 +08:00
halx99 d0a5839439 Use modern gl/gles loader 'glad' to instead 'glew' 2020-02-15 23:51:23 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad 
Merge pull request #50 from weiwest/master

add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 53d784af8d fix #51 2020-02-12 20:15:09 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 aa4d08eb3f Merge: ffcb65fdaa e10155bef4 
Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest 2acb59d377 add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 a91953ac1a Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest 27927bbcb3 add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 2a091cc86f fix etc1 supported for android platform. 2019-12-02 23:01:06 +08:00
halx99 a196b88075 Refactor audio, fix android compile issue since we remove SimpleAudio 2019-12-01 13:45:49 +08:00
halx99 a9776f7c49 Update javaactivity-android.cpp 2019-12-01 03:15:14 +08:00
halx99 ce48dfe27e usedefault, fix compile issue for android 2019-12-01 02:32:37 +08:00
halx99 aef75961a7 fix compile issue 2019-12-01 01:38:30 +08:00
halx99 3582e188f1 Add ZipFileStream support 2019-12-01 01:16:46 +08:00
halx99 410ceb8143 Update CCFileUtils-android.cpp 2019-11-30 23:57:35 +08:00
halx99 7d183d5a39 Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 cce30823f7 use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 ac789dbf81 a. use win32 api to get fie size; b. use int64_t for file size, c. use stat to check whether file exist for android platform. 2019-11-27 15:09:45 +08:00
halx99 9d53924e4c Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 db27a92625 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
halx99 ada10077b5 Merge: 72c1f27ce4 8cb40c339a 
Merge pull request #3 from simdsoft/update-readme

Update README.md
 2019-11-25 09:36:20 -08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 075aadee32 Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 521ff411a5 Merge: 5f1dc7c748 6000f7b796 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 17:06:24 +08:00
halx99 5faf15e10f Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 f59bcb1ab0 Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 a56cddfefe Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 442012b525 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 4d92a64c03 Use xsxml for sax parser, rapidxml could be removed 2019-11-24 21:01:15 +08:00
halx99 7856224ff2 Refactor CCDownloader, use curl for all platforms. 2019-11-24 15:43:28 +08:00
halx99 f176bb0803 Refactor AudioEngine implementation, use OpenAL for all platforms. 2019-11-24 14:54:45 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00