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

13601 Commits

Author SHA1 Message Date
halx99 35f2ec6897 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 87e7d3b62a fix compile issue 2019-11-30 14:32:18 +08:00
halx99 9bbc68cecd Sync audio header files 2019-11-30 14:21:36 +08:00
HALX99 fafa3ab1ea
Merge pull request #14 from simdsoft/upto-deps-7 
update to deps-7
 2019-11-29 15:19:39 -08:00
halx99 9c0ef83757 optimize 2019-11-30 06:55:32 +08:00
halx99 9807664441 fix indent 2019-11-30 06:17:33 +08:00
halx99 121e09ee0d ogg for ios 2019-11-30 06:11:17 +08:00
halx99 ded0e81e5a Use macro CC_BUILD_WITH_DRANGBONES to control whether build dragonbones, default is disabled. 2019-11-30 01:32:12 +08:00
HALX99 c1a0e57c41
Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 02c18d656a use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 4a040efbf6 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 d716d9511e Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 2a6cda73d7 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
HALX99 703a058aac
Merge pull request #11 from simdsoft/sync-v4 
Sync v4
 2019-11-26 08:49:56 -08:00
codetypes 4310342862 missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 8ff2ea18c2 fix update 2019-11-26 23:37:27 +08:00
halx99 259d67b60d fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 37d2952958 fix missing includes 2019-11-26 22:17:57 +08:00
halx99 073ad46a73 change GLubyte to uint8_t 2019-11-26 18:40:39 +08:00
halx99 df81bffdd2 add missing include file 2019-11-26 18:07:51 +08:00
halx99 644eef9978 add missing include file 2019-11-26 17:51:16 +08:00
halx99 b434678189 fix compile issue caused by fbs 2019-11-26 16:37:39 +08:00
HALX99 73a63bb53b
Merge pull request #7 from simdsoft/fix-ud 
Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00
halx99 08b8f087c2 Remove tinyxml2, sync ios & android platform. 2019-11-26 12:11:56 +08:00
halx99 bf807f8969 fix prid 2019-11-26 10:21:21 +08:00
HALX99 8546d4d7e1
Update AudioEngineImpl.mm 2019-11-26 09:54:25 +08:00
HALX99 2f2633ec91
fix typo, GLenum to ALenum 2019-11-26 03:07:55 +08:00
halx99 7efc643e54 fix ios compile issue, merge header AudioCache.h 2019-11-26 02:33:54 +08:00
HALX99 9a1c67031a
Merge pull request #3 from simdsoft/update-readme 
Update README.md
 2019-11-25 09:36:20 -08:00
HALX99 8cb40c339a
Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
HALX99 9aeb04de4b
fix CMakeLists.txt for apple 2019-11-25 20:55:41 +08:00
halx99 6078a4c922 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 96f72d8532 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 1bcac58aad fix AudioInfo construct. 2019-11-25 17:21:07 +08:00
halx99 3ef5ab500c Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 8729ecb461 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 17:06:24 +08:00
halx99 5f1dc7c748 Use toString instead. 2019-11-25 17:06:01 +08:00
HALX99 764109d93e
Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 797e85ba30 Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 30ffbe1514 Improve CCImage, BMP support. 2019-11-25 02:28:38 +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 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 7723fabb78
Merge pull request #13 from cocos2d/v4 
sync V4
 2019-11-23 20:20:02 -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
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
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
halx99 e647820c9c Merge from official-v4. 2019-11-20 18:27:56 +08:00
halx99 e7906acfa4 v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
codetypes d05967b69a fix setScissorRect crash (#20348) 
When part of scissorRect is out of render target viewport, it crash on mac.
Error message like this: -[MTLDebugRenderCommandEncoder setScissorRect:]:2703: failed assertion `(rect.y(568) + rect.height(447))(1015) must be <= render pass height(1000)'
 2019-11-20 11:03:59 +08:00
minggo 977510f41d
fix issue that videoplayer may crash on iOS (#20345) 2019-11-18 16:53:36 +08:00
coulsonwang b2940949dd implement setProgramState for SpriteBatchNode (#20344) 2019-11-18 15:04:47 +08:00
minggo 83b521991f
fix issue that can not close keyboard if using EditBox on iOS (#20336) (#20340) 2019-11-15 13:45:39 +08:00
Arnold 587bcabf44 fix asan reported errors (#20332) 2019-11-15 13:39:23 +08:00
minggo 9049ddbe7c
manually maintain reference count (#20329) 2019-11-15 11:39:49 +08:00
minggo bb5cf546f5
fix videoplayer crash in release mode (#20327) 2019-11-14 14:49:47 +08:00
minggo 3a36e2d5c2
Fixing a crash in iOS 9.3.5 when we have a layer with WebView getting deallocated (#20285) (#20328) 
* In case of iOS 9.3.5 when we show a web view and deallocate the layer it is trying to release memory associated with WKWebView instance, but it hadn’t retained it in the first place. This results in a crash. This commit fixes that crash.

* Removing the autorelease and retain parts from the WKWebView instantiation.

* Changes so that we can remove the retain from the property declaration and depend only on manual retain and release of memory <Deep>
 2019-11-14 14:49:11 +08:00
coulsonwang facf78a22b add opengl header since Texture2D and Image will use opengl define (#20322) 
* add opengl header since Texture2D and Image will use opengl define

* update review
 2019-11-13 17:46:40 +08:00
minggo 3aa7a73df2
Sync 20303 (#20308) 
* fix infinite loop

* fix issue that touch event does not match
If click area ouside keyboard, then engine only receive touch begin event witouth touch end or touch cancled event.
 2019-11-08 11:03:12 +08:00
coulsonwang 292e4c3b4d fix effect test (#20286) 2019-11-06 16:25:30 +08:00
minggo afbf817ec0
fix testfiled issue on iOS13 (#20296) 2019-11-06 16:11:37 +08:00
minggo 0cbaec9f29
don't set glview transparent, it many cause afterimage (#20298) (#20299) 2019-11-06 16:10:16 +08:00
minggo 01ff6ddd66
delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
minggo 5acc952a17
fix iOS build issue (#20292) 2019-11-05 15:23:54 +08:00
coulsonwang 8126cfafd5 add defualt ios deloyment target (#20282) 
* add defualt ios deloyment target
 2019-11-01 17:07:52 +08:00
minggo 29e50a8631
remove extern "C" from base/base64.h for avoiding base64 function symbols conflict at linking libraries. (#20276) (#20280) 2019-11-01 09:22:38 +08:00
minggo dddcdf3a87
Fixes so that in the web view we are able to navigate different links correctly <Deep> (#20266) (#20275) 2019-10-31 10:58:35 +08:00
coulsonwang 251eaa2033 fix crash due to iOS13 UIWindowScene (#20271) 2019-10-30 17:43:07 +08:00
coulsonwang d35a1dee45 fix crash due to iOS13 UIWindowScene 2019-10-30 13:55:52 +08:00
coulsonwang 4f486528cc fix walking boundary of 3D test in lua 2019-10-29 19:24:35 +08:00
minggo c17c0cd357
Merge pull request #20259 from Mee-gu/fixCrash 
fix crash
 2019-10-29 10:47:39 +08:00
coulsonwang 35b246939a update review 2019-10-28 18:11:17 +08:00
coulsonwang a0d7751510 rename to make function name more clear 2019-10-28 16:47:27 +08:00
coulsonwang eb23e1ffde needs update texture info 2019-10-28 16:05:05 +08:00
coulsonwang d9f8296498 update reivew 2019-10-28 15:05:17 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
coulsonwang c85cfcb223 fix crash 2019-10-28 14:26:09 +08:00