Commit Graph

32870 Commits

Author SHA1 Message Date
pandamicro 9b11e32252 Gen bindings for v3.7.1 branch 2015-07-22 10:41:04 +08:00
pandamicro 78314eca35 Merge pull request #12945 from xiaofeng11/v3.7.1
Synchronize skybox parser with C++ version
2015-07-22 10:36:07 +08:00
XiaoFeng fcd7388936 Synchronize skybox parser with C++ version 2015-07-22 09:45:35 +08:00
pandamicro 25dff88ff4 Merge pull request #12922 from xiaofeng11/v3.7-release
[ci skip]Add Skybox parser to js
2015-07-22 09:12:38 +08:00
pandamicro c260783fd0 [JS] Revert const to var to avoid issues on web compilation 2015-07-21 18:23:57 +08:00
WenhaiLin 979a9be1f5 Add test case for test font supported by FullType. 2015-07-21 17:09:27 +08:00
WenhaiLin d0d481fd67 updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
pandamicro 4153806c26 Merge pull request #12934 from CocosRobot/update_lua_bindings_1437453283
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-21 16:22:36 +08:00
ZhangMenghe 2e72179b91 Remove a space 2015-07-21 15:22:03 +08:00
ZhangMenghe 94aa382669 Add testCase for setClearColor 2015-07-21 15:18:19 +08:00
ZhangMenghe 61e36463cc Modify a space 2015-07-21 14:00:59 +08:00
ZhangMenghe 3c2d68e25c Modify the testcase with coding standards 2015-07-21 13:48:08 +08:00
pandamicro d478c5f8a8 Merge pull request #12923 from ZhangMenghe/ModifytestCase
Modify testCase for UITextFieldTest
2015-07-21 12:53:26 +08:00
CocosRobot 6630157377 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-21 04:40:43 +00:00
pandamicro 8412d19a8b Merge pull request #12933 from pandamicro/v3
Sync Cocos2d-x v3.7
2015-07-21 12:31:03 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
pandamicro 00e3641700 Merge pull request #12932 from cocos2d/v3.7-release
Merge v3.7 release
2015-07-21 11:08:32 +08:00
pandamicro 31bd25a5e9 Merge pull request #12762 from yangws/issue_10759
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-21 10:47:55 +08:00
子龙山人 241dd54424 Merge pull request #12921 from yangws/issue_9382
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
2015-07-21 10:27:39 +08:00
pandamicro 55840b4561 Merge pull request #12930 from pandamicro/v3.7-release
[ci skip] Update release docs for v3.7
2015-07-21 09:50:32 +08:00
pandamicro f98e9495fe Update release docs for v3.7 2015-07-21 09:49:41 +08:00
pandamicro 273ce6270c Merge pull request #12929 from pandamicro/v3.7-release
Update html5 engine ref
2015-07-21 09:25:08 +08:00
pandamicro ed6d759145 Update html5 engine ref 2015-07-21 09:24:31 +08:00
Ricardo Quesada 301b55c686 Adds support for Spine runtime 2.3 2015-07-20 10:39:34 -07:00
pandamicro 641ff2abf4 Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 18:02:49 +08:00
ZhangMenghe 14c1862f7e Modify testCase for UITextFieldTest 2015-07-20 18:01:41 +08:00
Vincent Yang cb5e2d59c3 Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. 2015-07-20 17:50:02 +08:00
子龙山人 29497c5bb7 Merge pull request #12916 from CocosRobot/update_lua_bindings_1437375818
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-20 15:11:51 +08:00
CocosRobot 0a23e4a305 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-20 07:08:12 +00:00
pandamicro 1afc0c1e48 Merge pull request #12912 from zilongshanren/addTwoAPIToNode
add Two APIs to Node.
2015-07-20 15:00:20 +08:00
yangxiao e5ac3ee090 ignore Animate getKeyFrameUserInfo 2015-07-20 14:54:11 +08:00
pandamicro 371053305e Merge pull request #12915 from yangws/issue_12887
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after…
2015-07-20 14:01:21 +08:00
andyque c4d8ebc780 add Two APIs to Node.
1. add getNodeToParentTransform(Node* ancestor)

2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +08:00
yangxiao 583d82c1e8 ignore Animate getKeyFrameUserInfo 2015-07-20 11:49:30 +08:00
Vincent Yang 14a419d725 Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate. 2015-07-20 11:14:06 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
子龙山人 87fd0d55ad Merge pull request #12898 from WenhaiLin/v3.8-systemfont-invisible-fix
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-20 10:24:21 +08:00
Bin Zhang abd8a563dc Support new portrait project from js templates. 2015-07-20 09:58:40 +08:00
Bin Zhang a8b22f6886 Support new portrait project from lua templates. 2015-07-20 09:58:40 +08:00
Bin Zhang 18882f12cb Support new portrait project from cpp template. 2015-07-20 09:58:40 +08:00
子龙山人 b6aa3960d2 Merge pull request #12848 from Mazyod/v3
Improving iOS EditBox Implementation
2015-07-18 23:21:27 +08:00
子龙山人 c4fa3ac6c6 Merge pull request #12901 from Mazyod/mac-editbox-cleanup
Mac EditBox cleanup:
2015-07-18 23:14:05 +08:00
Mazyad Alabduljaleel fa284bc2db headers and whitespace 2015-07-17 18:05:42 +03:00
子龙山人 45cd7cf681 Merge pull request #12501 from namezero111111/patch-6
Circle shape debug draw bug
2015-07-17 22:53:53 +08:00
Mazyad Alabduljaleel 2bb26e31d0 simplify CGRect math 2015-07-17 17:38:16 +03:00
Mazyad Alabduljaleel 54f52dac80 reduce header exposure
this is important, so we know that this class is only used in one place
2015-07-17 17:37:15 +03:00
Mazyad Alabduljaleel 32c5be84b8 weird, how did this slip 2015-07-17 17:15:41 +03:00
Mazyad Alabduljaleel d8b7b1d565 Mac EditBox cleanup:
+ Reduce header clutter
+ consistent property access and overall code style
+ cleanup extra code
2015-07-17 17:12:09 +03:00
Mazyad Alabduljaleel 7861bfd403 Final touch ups:
- group textfield delegate methods
- remove unused code
2015-07-17 16:25:45 +03:00
yangxiao beda48124c merge cocos 2015-07-17 17:54:00 +08:00