Commit Graph

34189 Commits

Author SHA1 Message Date
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
Ricardo Quesada 67948ff8c8 adds jsb_ref_get_or_create_jsobject()
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
2015-12-03 15:40:52 -08:00
Ricardo Quesada 37b4c3fe6a CallFuncN converted to new JS API 2015-12-03 15:24:37 -08:00
Ricardo Quesada 013f5b8d33 layerMultiplex converted to new JS API 2015-12-03 15:15:47 -08:00
Ricardo Quesada 3100cba5a1 Animation ported to JS 2015-12-03 15:02:39 -08:00
Ricardo Quesada cc6e72fe7c MenuToggleItem converted 2015-12-03 14:54:38 -08:00
Ricardo Quesada e5032dccc0 rootObject/unrootObject working again 2015-12-03 14:49:23 -08:00
Ricardo Quesada bd943c5415 Sequence/Spawn converted to use new API 2015-12-03 13:56:00 -08:00
CocosRobot 3edadc035b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 21:34:13 +00:00
Ricardo Quesada ef76c0ff01 Merge pull request #14571 from ricardoquesada/seq_spawn_init_api
Sequence + spawn init api
2015-12-03 13:19:09 -08:00
Ricardo Quesada f14688464f spawn2 in the correct place 2015-12-03 12:18:33 -08:00
Ricardo Quesada 3646d1e9fc Adds init(array) for Sequence and Spawn
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
CocosRobot 2b55b92e87 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 16:19:37 +00:00
Shun Lin d0ce2473a1 Merge pull request #14499 from xiaofeng11/v3_combine_safety
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
mogemimi be213bf306 Fix typos in documentation 2015-12-03 21:03:00 +09:00
CocosRobot bfb148e6ef [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 11:28:02 +00:00
zilongshanren ea42c09243 Merge pull request #14566 from zilongshanren/fixIssue14564
fix scale9sprite be culled unexpectedly
2015-12-03 19:17:40 +08:00
pandamicro 3961114fda Merge pull request #14567 from pandamicro/v3
Permit http access to cocos2d-x.org in test projects
2015-12-03 19:01:25 +08:00
pandamicro c304348c34 Merge pull request #14565 from pandamicro/v3
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
pandamicro 91909081da Merge pull request #14542 from pandemosth/issue_14539
Fix for Issue 14539
2015-12-03 18:47:17 +08:00
pandamicro e23432c6fa Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android
Fix Downloader bug iOS & Android
2015-12-03 18:46:43 +08:00
pandamicro b6fd2e9449 Permit http access to cocos2d-x.org in test projects 2015-12-03 18:00:48 +08:00
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00