Commit Graph

32870 Commits

Author SHA1 Message Date
WenhaiLin 731de26795 Label:Fixed system font may be invisible when there are multiple cameras. 2015-07-17 17:45:11 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
子龙山人 0ea8dca299 Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312
Label:support font that contains GB2312 char map.
2015-07-17 17:33:52 +08:00
子龙山人 22ef262295 Merge pull request #12894 from zilongshanren/fixXcode5Warning
fix xcode 5.1.1 warnings
2015-07-17 17:33:13 +08:00
子龙山人 309b563c5b Merge pull request #12896 from yangws/v3
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
2015-07-17 15:57:19 +08:00
Wenhai Lin 66dadea0cd Rollback log level 2015-07-17 15:56:51 +08:00
Vincent Yang f9e90f31f6 Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset. 2015-07-17 15:52:58 +08:00
子龙山人 c82cf5ecd4 Merge pull request #12891 from fusijie/refine_HttpAsynConnection
refine NSLog in HttpAsynConnection in release mode.
2015-07-17 15:29:55 +08:00
andyque 8c31d70211 fix xcode 5.1.1 warnings 2015-07-17 15:20:49 +08:00
fusijie 2c5e2db6b4 refine NSLog in HttpAsynConnection in release mode. 2015-07-17 14:23:51 +08:00
jianglong0156 7f0167785d add back label 2015-07-17 13:46:00 +08:00
jianglong0156 c844a77786 add fileUtils writeString,writeValueMap,writeValueVector 2015-07-17 12:04:47 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
Wenhai Lin 45e0eda81c Fixed compile error 2015-07-17 11:34:26 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
子龙山人 a59d17243e Merge pull request #12886 from zilongshanren/fix-framework-mac-compile-issue
[ci skip]add xcpretty to framework mac build
2015-07-17 10:49:19 +08:00
andyque 042a3dc2ec add xcpretty to framework mac build 2015-07-17 10:48:05 +08:00
andyque c9ca8d9ce8 fix PageView cur index issue 2015-07-17 10:39:01 +08:00
子龙山人 3167029929 Merge pull request #12884 from natural-law/v3.7-release
[ci skip] Update the reference of submodule cocos2d-console.
2015-07-17 10:10:37 +08:00
Bin Zhang a5e3267c98 Update the reference of submodule cocos2d-console. 2015-07-17 10:08:35 +08:00
子龙山人 0b0b25c517 Merge pull request #12872 from zilongshanren/remove-emscript-code
remove EMSCRIPTEN related code
2015-07-17 10:08:34 +08:00
pandamicro edebcd92c5 Merge pull request #12883 from pandamicro/v3.7-release
[ci skip] Fix download section in readme
2015-07-17 01:27:08 +08:00
pandamicro 2507673c5a Fix download section in readme 2015-07-16 23:32:18 +08:00
WenhaiLin f0b29814c3 Label:support font that contains GB2312 char map.[android] 2015-07-16 21:35:10 +08:00
子龙山人 c928976e96 Merge pull request #12880 from CocosRobot/update_lua_bindings_1437037100
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 17:19:06 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
CocosRobot 047d3dd398 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 09:02:35 +00:00
pandamicro 65f647ce00 Merge pull request #12879 from pandamicro/v3.7-release
[ci skip] Update versions and docs for v3.7
2015-07-16 16:55:24 +08:00
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
pandamicro 4d18b6895a Merge pull request #12877 from CocosRobot/update_lua_bindings_1437034712
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 16:41:05 +08:00
CocosRobot f2567f498c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 08:22:58 +00:00
pandamicro b094367c94 Merge pull request #12874 from pandamicro/v3.7-release
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 16:15:26 +08:00
子龙山人 a72ea73e60 Merge pull request #12863 from fusijie/fix_polygonsprite_setColor
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-16 14:51:06 +08:00
pandamicro ae2d955955 Update web engine ref 2015-07-16 14:39:09 +08:00
pandamicro 949eca2846 Improve some manual binding code 2015-07-16 14:34:14 +08:00
andyque 7c665e6447 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
子龙山人 63add82659 Merge pull request #12871 from CocosRobot/update_lua_bindings_1437026365
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 14:12:41 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
CocosRobot 8442fe5f89 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 06:04:17 +00:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
pandamicro 0b1d105803 Merge pull request #12870 from VisualSJ/v3.7-release-parser
[ci skip] Fixed parser's bug
2015-07-16 13:04:06 +08:00
VisualSj 0bb385f37c Check texture for existence 2015-07-16 11:54:45 +08:00
andyque 517221a0df add jumpToPage API to PageView.
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
VisualSj ef70e1f996 Fixed a bug that is Armature parser 2015-07-16 10:30:22 +08:00
pandamicro 73a75ea5fb Merge pull request #12868 from pandamicro/v3.7-release
Update web ref
2015-07-15 22:37:08 +08:00
pandamicro 04fd171e77 Update web ref 2015-07-15 22:36:28 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00