Commit Graph

32691 Commits

Author SHA1 Message Date
子龙山人 c535c9df3f Merge pull request #13833 from CocosRobot/update_lua_bindings_1442313090
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 21:23:40 +08:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668
Fix for #13668
2015-09-15 18:28:24 +08:00
子龙山人 f5848290a2 Merge pull request #13673 from Almax27/patch-3
Removed ScrollView::_innerContainer pointer copy
2015-09-15 17:42:20 +08:00
子龙山人 6eece55e80 Merge pull request #13828 from CocosRobot/update_lua_bindings_1442298458
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 16:55:14 +08:00
子龙山人 2157059fef Merge pull request #13826 from zilongshanren/enableSliderBodyTouch
Enable tapping Slider bar to scroll
2015-09-15 16:55:00 +08:00
Neo Kim ade2611cfe Merge pull request #3 from zilongshanren/testFixIssue13668
fix ui::Button title location issue
2015-09-15 15:35:33 +09:00
CocosRobot 19561ca84b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 06:32:52 +00:00
子龙山人 73d2c5d1b8 Merge pull request #13577 from fusijie/fix_13454
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
andyque fe5a43c428 Enable tapping Slider bar to scroll
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13434
2015-09-15 14:13:52 +08:00
pandamicro 5e037c9ad8 Merge pull request #13806 from xiaofeng11/v3
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
2015-09-15 14:05:02 +08:00
andyque 556175df1e add iOS EditBox multiline support
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.

Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
子龙山人 5e7270be16 Merge pull request #13824 from CocosRobot/update_lua_bindings_1442295639
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 13:51:05 +08:00
CocosRobot c9b30bd391 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 05:45:47 +00:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
pandamicro dbe3e062bc Merge pull request #13801 from chengstory/OptimizateDoLayout
Move "ui::Helper::DoLayout"  to "CreateNode"。
2015-09-15 13:37:00 +08:00
zhangcheng fb104189d4 Multiplexing ccs.load. 2015-09-15 13:04:45 +08:00
zhangcheng fa7f97b26e Adjustment spaces. 2015-09-15 11:35:43 +08:00
子龙山人 02eca21b78 Merge pull request #13701 from seivan/patch-3
Don't call release() before retain() #13656
2015-09-15 11:28:56 +08:00
Vincent Yang bf477c6bfb Restructure AssetsManagerEx. 2015-09-15 11:23:46 +08:00
zhangcheng 83f5f85f56 add loadWithVisibleSize js function. 2015-09-15 11:16:02 +08:00
子龙山人 d3d1c5651a Merge pull request #13817 from CocosRobot/update_lua_bindings_1442280641
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 10:07:00 +08:00
子龙山人 4c4a007b99 Merge pull request #13797 from natural-law/v3
Update the reference of submodule cocos2d-console.
2015-09-15 10:06:24 +08:00
CocosRobot 4b3e71e353 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 01:35:59 +00:00
子龙山人 1d7d283ee6 Merge pull request #13549 from neokim/add_getters_for_renderers_into_button
Add getters for the internal renderer instances of Button
2015-09-15 09:26:34 +08:00
pandamicro 89d81bd959 Merge pull request #12281 from lijinlong/v3
luabinding enumerateChildren bug
2015-09-14 22:32:56 +08:00
pandamicro dd6c1bc611 Merge pull request #13802 from geron-cn/v3bugfixs
fix crash recall a cached timeline after exit scene
2015-09-14 22:12:06 +08:00
XiaoFeng 12f0f7f580 Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
zhangcheng 224f392a9c Add createNodeWithVisibleSize to CSLoader. 2015-09-14 16:51:58 +08:00
Vincent Yang ebf308d88c Test case Downloader Test restructured. 2015-09-14 15:33:34 +08:00
ZhangMenghe 5f8351ea32 UItestcase modification to be friendly 2015-09-14 15:31:25 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09:00
geron-cn c800d0d824 fix crash recall a cached timeline after exit scene 2015-09-14 14:24:42 +08:00
pandamicro 1fd2e65b48 Merge pull request #13799 from CocosRobot/update_lua_bindings_1442203019
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-14 13:12:36 +08:00
zhangcheng f88b23f52b Move "ui::Helper::DoLayout" to "CreateNode". 2015-09-14 13:07:15 +08:00
pandamicro 9fbefb8eed Merge pull request #13786 from dumganhar/lua-xmlhttprequest-fix
[Lua] Life control fix for XMLHttpRequest
2015-09-14 12:12:41 +08:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00:00
pandamicro 1e7b78b057 Merge pull request #13795 from pandamicro/v3
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:54:02 +08:00
zhangbin da24454c6c Update the reference of submodule cocos2d-console. 2015-09-14 11:46:02 +08:00
子龙山人 c532db4f11 Merge pull request #13793 from CocosRobot/update_cocosfiles_1442199430
[AUTO][ci skip]: updating cocos2dx_files.json
2015-09-14 11:36:01 +08:00
子龙山人 c013634bd5 Merge pull request #13796 from CocosRobot/update_lua_bindings_1442200986
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-14 11:35:54 +08:00
CocosRobot 643bdd8d6e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 03:29:24 +00:00
pandamicro b0dc83aed8 Update bindings-generator to initialize numeric/pointer variables 2015-09-14 11:22:06 +08:00
pandamicro aff87935a8 Merge pull request #13794 from pandamicro/v3
[ci skip]Fix build_native for js default template
2015-09-14 11:19:18 +08:00
pandamicro 737dc5ba8d Fix build_native for js default template 2015-09-14 11:18:32 +08:00
CocosRobot f8eb3a9b1a [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-14 02:57:12 +00:00
pandamicro d3a76bc872 Merge pull request #13792 from natural-law/v3
Add tools for converting the performance tests data to excel files.
2015-09-14 10:55:27 +08:00
zhangbin 5d47ce8f23 Add tools for converting the performance tests data to excel files. 2015-09-14 09:52:21 +08:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00