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

153 Commits

Author SHA1 Message Date
halx99 f9ae5401ec Add copyright notice [skip appveyor][skip travis] 2020-09-01 13:24:45 +08:00
halx99 45b2ab7134 Also decode bmp to RGBA8888 directly 2020-09-01 12:06:21 +08:00
halx99 cc53868d27 More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 815c737e6b wrap fowardPixels for hardware decoder 2020-08-31 23:09:42 +08:00
halx99 09cedf60b2 Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 e96ae229dd Merge: 5ddc84bbee 539e5ca42c 
Merge pull request #189 from aismann/patch-8

Update README.md
 2020-08-31 04:27:33 -07:00
halx99 a87c0bba78 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 fa5d2d198b fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 c338472df8 Move copyright notice to header [skip appveyor][skip travis] 2020-08-31 17:35:01 +08:00
halx99 477aa0c185 Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 65a7bd5360 Remove test code [skip appveyor] [skip travis] 2020-08-31 16:31:37 +08:00
halx99 b12068e1c8 Use etc2_decode_image decode etc1 to RGBA8888 [skip appveyor] [skip travis] 
This can avoid further texture data convert
 2020-08-31 15:34:20 +08:00
halx99 da8f1c56fe ETC2 software decode support 2020-08-31 14:11:48 +08:00
halx99 43f464163c 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 238cd782e3 Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS 2020-08-28 12:57:00 +08:00
halx99 2a234afc3d Improve listFiles for win32, use std::move avoid string deep copy 2020-08-28 11:05:32 +08:00
halx99 e75a29a393 fix #179 2020-08-28 11:04:14 +08:00
halx99 6345cca301 freetype stream parsing support, reduce memory use on FontCache 2020-08-27 11:35:55 +08:00
halx99 ea1cb45ba3 Refine code style 2020-08-27 10:19:21 +08:00
halx99 c9d6c5afdf Rename PXFileStream to CCFileStream 2020-08-27 00:21:44 +08:00
halx99 083d14f342 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 b594cda5e3 Consider mutex use, which object dou you want guard? 2020-08-18 12:48:16 +08:00
halx99 9eb32b634f Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +08:00
halx99 c9882c195a Update README_CN.md 2020-08-18 12:11:04 +08:00
halx99 641b2e40f3 Sync fix from https://github.com/cocos2d/cocos2d-x/pull/20518 2020-08-18 12:09:56 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 b090664084 Make android listFiles behavior same with other platforms 2020-08-17 12:09:31 +08:00
aismann 63e7c6e4dc OpenGL 'works' better... 2020-08-07 08:10:12 +02:00
halx99 4214ed6add Add missing optimize from v3 2020-08-05 13:10:37 +08:00
halx99 df2073f1e5 win32 cover wide API use, remove unused long getFieSize(const std::string&) 2020-08-05 12:24:31 +08:00
halx99 9f66d7dce0 utf-8 file path 2020-08-05 12:17:57 +08:00
halx99 8f541a61a7 Merge: 5f96ce8981 3e95b8ccf3 
Merge pull request #135 from halx99/unify-plist-ops

Unify plist implementation, remove apple specific sources.
 2020-08-02 20:22:36 -07:00
halx99 588e977ef0 Merge: 8cc189fb4d 6fd4d6e4ab 
Merge pull request #134 from halx99/fullscreen-mode

Refactor full screen support
 2020-08-02 20:03:07 -07:00
halx99 d6958498d4 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 8024b9b2e9 Adapte multi monitors 2020-08-03 10:33:04 +08:00
halx99 1c59ba423c Unnecessary space lilne [skip appveyor] [skip travis] 2020-08-02 17:00:35 +08:00
halx99 996f303eb7 Optimize param use. 2020-08-02 16:48:19 +08:00
halx99 b12cde7c19 vidMode need moniter 2020-08-02 16:36:58 +08:00
halx99 049a7e58ba Update comment [skip appveyor] [skip travis] 2020-08-02 16:24:30 +08:00
halx99 76d246ce54 check isFullscreen 2020-08-02 16:22:41 +08:00
halx99 2bd0a48e02 Provide more useful for setFullscreen with width,height,refreshRate. 2020-08-02 16:18:39 +08:00
halx99 7c816dae8d Refactor full screen support, fix different behavior when enter full screen between 1 and >=2 times 2020-08-02 11:54:46 +08:00
halx99 bd9a409dd7 Add wav testcase 2020-08-01 19:25:39 +08:00
halx99 f807981d80 fix #129 2020-08-01 11:23:13 +08:00
halx99 2a2b397f27 Add alconfig.h to choose whether use openal-soft 2020-07-31 17:03:58 +08:00
halx99 9345f18159 Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF 2020-07-31 00:06:59 +08:00
halx99 4ff88cc55c Sync fix from v3, see also: https://github.com/cocos2d/cocos2d-x/pull/20509 2020-07-30 10:59:50 +08:00
halx99 16a0fd73c3 Merge: db0ed5bd59 a3a65b0320 
Merge pull request #109 from halx99/win-utf8

Improve utf-8 path on win32, explicit call wide version of system API.
 2020-07-10 16:56:18 +08:00
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