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

38808 Commits

Author SHA1 Message Date
HALX99 764109d93e
Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 2c48f4e4f7 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 14:39:46 +08:00
halx99 5f1a2b05a6 Sync 3rd 2019-11-25 14:38:12 +08:00
HALX99 f2be8795ba
Update README.md 2019-11-25 13:12:51 +08:00
HALX99 dd95fc8914
Update README.md 2019-11-25 13:08:46 +08:00
HALX99 30dbdda988
Update README.md 2019-11-25 10:28:17 +08:00
HALX99 902d6f1f8b
Update README.md 2019-11-25 10:27:09 +08:00
HALX99 a1c4bc46eb
Update README.md 2019-11-25 10:24:20 +08:00
HALX99 1e22f53a88
Update README.md 2019-11-25 10:23:47 +08:00
HALX99 a21b28ede7
Add goals to readme 2019-11-25 10:22:58 +08:00
HALX99 3586701173
Rename README.md to README.ccv4.md 2019-11-25 10:20:29 +08:00
halx99 797e85ba30 Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 ab7ccf0a58 Update etc1 alpha test case 2019-11-25 02:46:52 +08:00
halx99 30ffbe1514 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
HALX99 243844c3cf
Delete engine-v5.txt 2019-11-25 02:02:46 +08:00
halx99 61223a3782 lua53 compat, both lua51, lua52, luat3, luajit are supported. 2019-11-25 01:59:08 +08:00
halx99 3fcb8883c2 Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
halx99 2c55d175d3 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-24 23:16:11 +08:00
halx99 98a3bd35f0 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 f332ae77c1 Remove unused log. 2019-11-24 21:02:41 +08:00
halx99 d3e97a75a3 Remove websockets, sync tests. 2019-11-24 21:02:16 +08:00
halx99 cac329738d Use xsxml for sax parser, rapidxml could be removed 2019-11-24 21:01:15 +08:00
halx99 d319436cdc Remove xxtea. 2019-11-24 19:17:23 +08:00
halx99 af22abc2a8 Remove websockets, sync lua bindings. 2019-11-24 19:16:13 +08:00
halx99 97e81e8180 Refactor CCDownloader, use curl for all platforms. 2019-11-24 15:43:28 +08:00
halx99 70b71c85cc Remove websockets. 2019-11-24 15:08:59 +08:00
halx99 c8f85a4a95 Refactor AudioEngine, fix compile issue. 2019-11-24 15:07:48 +08:00
halx99 a759332591 Refactor AudioEngine implementation, use OpenAL for all platforms. 2019-11-24 14:54:45 +08:00
halx99 b0c62c07c2 add goal 2019-11-24 14:09:02 +08:00
halx99 9400bf79d8 update ignores. 2019-11-24 13:47:32 +08:00
halx99 a5e8d4b5a1 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-24 13:41:16 +08:00
HALX99 7723fabb78
Merge pull request #13 from cocos2d/v4 
sync V4
 2019-11-23 20:20:02 -08:00
HALX99 22a085e6b8
fix edit box position error (#20358) 2019-11-24 00:27:19 +08:00
halx99 179ec6ed67 fix ci error 2019-11-23 21:25:17 +08:00
halx99 b94d75e5d6 fix ci error. 2019-11-23 20:27:39 +08:00
codetypes e9305431da fix edit box position error (#20358) 
'sysEdit' y position is relate with frame height, not the viewport height. When in FIXED_WIDTH mode, if frame height is bigger than viewport height, it will got error y position.
 2019-11-23 18:25:49 +08:00
halx99 c180c29d32 for MTL layer 2019-11-22 22:10:55 -08:00
coulsonwang c048d6b6bd no need to update color (#20363) 2019-11-23 10:04:23 +08:00
codetypes 9b8a72a843 fix AudioEngine maybe crash on android (#20361) 
* fix AudioEngine maybe crash on android

I receive many crash about std::base_string in bugly(tencent) crash report, i can't prove those crash is relate with this, but when after  fix, i never receive again. so i think there maybe some situation will cause crash.

* type of 'filePath' change to std::string
 2019-11-23 10:00:16 +08:00
CocosRobot 191b2b8982 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20366) 2019-11-22 17:06:40 +08:00
codetypes c81b7a0f09 support load asset in internal storage or sdcard (#20359) 
* support load asset in internal storage or sdcard

* fix crash when fullPath.size() == 0
 2019-11-22 16:08:00 +08:00
codetypes b9df4bd63b format spelling (#20360) 2019-11-22 16:07:43 +08:00
coulsonwang 5b15737b3a fix walking boundary of terrain (#20364) 2019-11-22 16:07:14 +08:00
HALX99 c08e2cda4d
Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
halx99 78ed4e230b TextureFormatEXT 2019-11-22 03:36:01 +08:00
halx99 22d5008d28 PremultipliedAlpha 2019-11-22 01:39:03 +08:00
Arnold 3b4748009f
use copy instead of linkis (#20356) 2019-11-21 15:12:37 +08:00
halx99 8b62addcec Rename parameters. 2019-11-20 19:22:22 +08:00
halx99 5d5e6fcfec Remove comment. 2019-11-20 18:44:45 +08:00
halx99 0caf671edd Fix merge error. 2019-11-20 18:35:48 +08:00