Commit Graph

33499 Commits

Author SHA1 Message Date
XiaoFeng 73d0f8a46e Bug fix & make test case more clear.
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
zilongshanren 6f7e5a5c06 Merge pull request #14607 from liamcindy/v3_issuseRevert
revert error changes
2015-12-07 18:16:49 +08:00
zilongshanren 6c17ef4baf fix horizontal clamp and shrink issue 2015-12-07 18:13:03 +08:00
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
pandamicro 9ff4fb4f7e Merge pull request #14604 from dumganhar/actionnode-fix
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
2015-12-07 15:49:16 +08:00
James Chen 462796d2dd Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
zilongshanren e1656264fc Merge pull request #14601 from CocosRobot/update_lua_bindings_1449457848
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 14:27:06 +08:00
zilongshanren 9d85b6ca04 Merge pull request #14602 from CocosRobot/update_lua_bindings_1449458892
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 14:26:53 +08:00
CocosRobot 7e803cbd0a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:30:43 +00:00
xiaofeng11 2efab7d2df Merge pull request #14586 from xiaofeng11/v3_xf
Add missing export declaration.
2015-12-07 11:24:29 +08:00
CocosRobot 64fa2de345 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:13:21 +00:00
zilongshanren c9d32a83b8 Merge pull request #14597 from mogemimi/fix-api-spelling
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
XiaoFeng b435f1df86 Fix wrong #endif statement 2015-12-07 10:44:52 +08:00
XiaoFeng 0328c31596 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf 2015-12-07 10:27:38 +08:00
Ricardo Quesada 622c34e8ba Merge pull request #14591 from ricardoquesada/js_more_conversions
Js more conversions
2015-12-06 08:27:13 -08:00
Ricardo Quesada d02f4afd4a using new bindings templates
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
mogemimi c7640c8aaf Replace 'resoucedata' with 'resourcedata' in JS Binding 2015-12-05 18:59:54 +09:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 2015-12-05 18:59:54 +09:00
Ricardo Quesada aebfefd7a8 Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08:00
Ricardo Quesada cd8631ef09 sfunction "create" uses new optimized code
...although this code should never be called
2015-12-04 18:42:31 -08:00
Pan Demosthenous 54ac5d8d2e fix allocation issue with remote images 2015-12-05 10:10:58 +11:00
Slack-Moehrle 558c4cf248 added learning, spreading the word, where to get help
added learning, spreading the word, where to get help
2015-12-04 15:27:51 -05:00
XiaoFeng 76bd37e109 Add missing export declaration. 2015-12-04 19:40:09 +08:00
pandamicro d371ec2c8a Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 17:53:46 +08:00
pandamicro 51acfa8908 Merge pull request #14581 from xiaofeng11/v3_xf
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
CocosRobot d5e54bdb81 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 09:48:13 +00:00
pandamicro 6ff2586f26 Merge pull request #14574 from super626/v3
Fix Sprite3D::setMaterial when multiple meshes exist
2015-12-04 17:38:56 +08:00
XiaoFeng 1b6a13d4b5 Fix compile error 2015-12-04 17:22:41 +08:00
pandamicro 88d2987fb1 Merge pull request #14582 from CocosRobot/update_cocosfiles_1449216428
[AUTO][ci skip]: updating cocos2dx_files.json
2015-12-04 16:16:41 +08:00
CocosRobot ddb0fc91b2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-12-04 08:07:09 +00:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
XiaoFeng 8f9ea8a87e Add missing lua engine export declaration. 2015-12-04 15:23:59 +08:00
pandamicro 968d038d2c Merge pull request #14579 from CocosRobot/update_lua_bindings_1449212834
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 15:15:30 +08:00
XiaoFeng 71217fd393 Fix indent 2015-12-04 15:14:47 +08:00
CocosRobot d09eae92f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 07:13:02 +00:00
Ricardo Quesada f6c2758801 Merge pull request #14409 from xiaofeng11/v3_combine_opengl
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -08:00
XiaoFeng 1171c6aaa1 Remove desktop only function, set ondraw serial function in DrawNode override able. 2015-12-04 14:55:54 +08:00
Ricardo Quesada 0e34a864b2 Merge pull request #14528 from xiaofeng11/v3_3dtouch
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
yangxiao 8d546828f4 fix Sprite3D::setMaterial 2015-12-04 10:54:43 +08:00
XiaoFeng 6fb65b5610 Editing code as comment.
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
pandamicro 40865ad88f Merge pull request #14573 from CocosRobot/update_lua_bindings_1449194325
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 10:04:16 +08:00
CocosRobot fd2d616aed [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 02:03:46 +00:00
zilongshanren 01644cb46e Merge pull request #14569 from mogemimi/fix-docs-typo
Fix typos in documentation
2015-12-04 09:55:30 +08:00
zilongshanren d8f44f55a7 Merge pull request #14572 from CocosRobot/update_lua_bindings_1449177866
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:53:59 +08:00
zilongshanren 9a6882c043 Merge pull request #14570 from CocosRobot/update_lua_bindings_1449158992
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:53:50 +08:00
zilongshanren 43cfa8b7fa Merge pull request #14568 from CocosRobot/update_lua_bindings_1449141666
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:53:39 +08:00
XiaoFeng 2da192a1c2 Remove cocostudio header file from sprite and particle, and adjust tests
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
Ricardo Quesada 49882ed91c js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI 2015-12-03 15:49:56 -08:00
Ricardo Quesada b87975096e GLProgram converted to new JSAPI 2015-12-03 15:47:39 -08:00