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

36397 Commits

Author SHA1 Message Date
子龙山人 ed1496674e Update .travis.yml 2016-06-21 11:21:22 +08:00
halx99 51ba45ae26 Optimize, avoid unnecessary memory alloc & copy 2016-06-21 10:52:25 +08:00
Ricardo Quesada ca677f2be1 fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode 
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.

Github issue #14730
 2016-06-20 19:13:53 -07:00
Julien Jorge 6fb3946c51 Add a config option to enable or disable the premultiplied alpha code. 2016-06-20 18:05:11 +02:00
minggo c25550e1a4 Merge pull request #15886 from CocosRobot/update_cocosfiles_1466401280 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-20 18:02:08 +08:00
CocosRobot 1c8ab4f504 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-20 05:41:22 +00:00
minggo ad28d44d2f Merge pull request #15878 from cezheng/build_for_android6/downloader 
fix downloader build issue for Android API 23
 2016-06-20 13:38:22 +08:00
mogemimi f0028e5459 Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
sum 4700bbce43 fix restart game crash in FT_Get_Char_Index 2016-06-19 03:22:57 +08:00
Ricardo Quesada 49e24eb0ba Merge pull request #15882 from ricardoquesada/issue15214 
fix: underline will have the same solor as text in TTF
 2016-06-17 18:09:02 -07:00
Ricardo Quesada 35008702bf fix: underline will have the same solor as text in TTF 
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?

github issue #15214
 2016-06-17 17:23:59 -07:00
Ricardo Quesada d9b3ef55ae Merge pull request #15880 from ricardoquesada/issue-15776 
fix: TextureCache ASSERTS if image is invalid
 2016-06-17 16:48:19 -07:00
Ricardo Quesada c387f953fa fix: TextureCache ASSERTS if image is invalid 
Github issue #15776
 2016-06-17 16:07:33 -07:00
Ce Zheng 84db1ac294 fix downloader build issue for Android API 23 
fixes #15823
 2016-06-17 22:32:49 +09:00
minggo e3f496e815 Merge pull request #15876 from minggo/update-versoin-changelog 
[ci skip]Update versoin changelog
 2016-06-17 18:11:47 +08:00
minggo ed955cbe1d update version 2016-06-17 18:09:27 +08:00
minggo 3c12cce352 update changelog 2016-06-17 18:09:20 +08:00
minggo f9988cad8e Merge pull request #15873 from CocosRobot/update_lua_bindings_1466129959 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-06-17 11:54:31 +08:00
minggo 3ab6f78965 Merge pull request #15872 from CocosRobot/update_cocosfiles_1466129842 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-17 11:54:23 +08:00
CocosRobot 4c233b8df7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-17 02:22:58 +00:00
CocosRobot eee0d14e8f [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-17 02:17:23 +00:00
minggo 6778ebf451 Merge pull request #15853 from ricardoquesada/vr_squashed 
Squashed commit of the following:
 2016-06-17 10:15:20 +08:00
minggo e9cf762304 Merge pull request #15866 from minggo/remove-compiling-flag 
remove gcc comipling flag
 2016-06-17 09:39:18 +08:00
minggo 34f8fcbef0 Merge pull request #15867 from Microsoft/v3-win10-fix 
V3: removed incorrect AppBundle info for Win10 cpp-test project
 2016-06-17 09:39:09 +08:00
minggo 6280b8a376 Merge pull request #15870 from mogemimi/fix-unused-function 
Remove unused debug function in RenderCommand
 2016-06-17 09:38:32 +08:00
minggo 44ced37785 Merge pull request #15825 from dumganhar/iss15652-perf-fix 
issue #15652: fix low FPS on some android devices while auto batch is disabled.
 2016-06-17 09:37:42 +08:00
minggo 3a0b2aff1e Merge pull request #15865 from CocosRobot/update_cocosfiles_1466063494 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-17 09:37:01 +08:00
mogemimi 0872a50f60 Remove unused debug function in RenderCommand 2016-06-17 03:19:19 +09:00
Ricardo Quesada 08ed2eccd2 fix: using `enum class` instead of `typedef enum` 2016-06-16 07:02:04 -07:00
Dale Stammen b80a81fc7c removed incorrect AppBundle info 2016-06-16 06:09:59 -07:00
minggo 832ec5eab4 remove gcc comipling flag 2016-06-16 16:14:50 +08:00
CocosRobot 134a09da6f [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-16 07:51:35 +00:00
minggo 50ebac34a6 Merge pull request #15864 from zilongshanren/upgrade-external-config 
bump config.json version to 99
 2016-06-16 15:49:24 +08:00
zilongshanren 40e72ffc53 bump config.json version to 99 2016-06-16 15:04:29 +08:00
minggo 0db0a45fa0 Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left 
fix TTF and BMFont word wrap
 2016-06-16 15:01:27 +08:00
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements 
Various CMake improvements
 2016-06-16 14:53:10 +08:00
minggo d66b686bd8 Merge pull request #15816 from yalab/valuemap_reject_none 
Fixed to fail FileUtils::writeValueMapToFile on iOS.
 2016-06-16 14:20:46 +08:00
minggo bef15fd971 Merge pull request #15861 from mogemimi/fix-wsometimes-uninitialized 
Fix -Wsometimes-uninitialized warning in release build
 2016-06-16 14:15:53 +08:00
zilongshanren f0f8663fa9 fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
minggo d12d19dbbe Merge pull request #15857 from minggo/issue-15833 
remove unneeded test case
 2016-06-16 14:13:59 +08:00
mogemimi 01aaff66c8 Fix -Wsometimes-uninitialized warning in release build 2016-06-16 14:27:52 +09:00
minggo 5fa57ae5c1 Merge pull request #15844 from halx99/patch-1 
fix: missing properties for clone
 2016-06-16 11:15:13 +08:00
minggo 0f2a8068c4 Merge pull request #15858 from CocosRobot/update_cocosfiles_1466046619 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-16 11:12:06 +08:00
CocosRobot 600175a93c [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-16 03:10:20 +00:00
minggo ab0e461b00 Merge pull request #15852 from MSOpenTech/v3-winrt-x64 
V3: updated to support Windows 10 UWP x64 builds
 2016-06-16 11:08:28 +08:00
minggo d8bd0ff8c8 Merge pull request #15855 from mogemimi/fix-possible-leak 
Fix possible memory leak when pass initialization fails
 2016-06-16 11:04:03 +08:00
minggo 1df89de065 Merge pull request #15856 from CocosRobot/update_lua_bindings_1466045768 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-06-16 11:02:18 +08:00
minggo 43ece2de34 remove unneeded test case 2016-06-16 11:00:15 +08:00
CocosRobot cc2b887dbb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-16 02:58:46 +00:00
minggo b0f3d43414 Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb 
RenderTexture - set opacity modify RGB
 2016-06-16 10:52:21 +08:00