Commit Graph

22394 Commits

Author SHA1 Message Date
minggo f74626e946 Merge pull request #7648 from CocosRobot/update_cocosfiles_1406879885
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 15:59:03 +08:00
CocosRobot ea1d9d4657 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 07:58:06 +00:00
minggo 6d6864056d Merge pull request #7646 from CocosRobot/update_lua_bindings_1406879478
[AUTO]: updating luabinding automatically
2014-08-01 15:56:09 +08:00
CocosRobot fda11428bf [AUTO]: updating luabinding automatically 2014-08-01 07:53:19 +00:00
minggo 2ca623a26a Merge pull request #7630 from huangshiwu/v3_pr
GLView Hook
2014-08-01 15:47:45 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
minggo e5aad1fa39 Merge pull request #7641 from CocosRobot/update_lua_bindings_1406865618
[AUTO]: updating luabinding automatically
2014-08-01 12:04:18 +08:00
minggo 80eaca9d84 Merge pull request #7640 from CocosRobot/update_cocosfiles_1406865528
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 12:02:48 +08:00
CocosRobot 26c76f5cf1 [AUTO]: updating luabinding automatically 2014-08-01 04:02:13 +00:00
minggo 0c9b960de3 [ci skip] 2014-08-01 12:01:12 +08:00
minggo 780549e5a7 [ci skip] 2014-08-01 11:59:44 +08:00
CocosRobot ce8c5ee327 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 03:58:50 +00:00
minggo 0b6254d095 Merge pull request #7587 from dzl-ian/fixTextWidgetColor
Add getter and setter for TextColor to Text Widget
2014-08-01 11:57:10 +08:00
minggo e3d17ac67d Merge pull request #7638 from natural-law/protected-node
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
2014-07-31 17:58:47 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
minggo d44a359a1f Merge pull request #7635 from samuele3hu/v3_new_module
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 17:39:01 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +08:00
samuele3hu 5b620e610f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_module 2014-07-31 16:44:29 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
minggo 8d8176737a Merge pull request #7634 from dabingnn/v3_mac_fix
fix some misc issues for mac
2014-07-31 16:28:33 +08:00
Huabing.Xu 2bf2bbeed7 1. remove mac 32bit
2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget
add target to build All target
2014-07-31 14:25:37 +08:00
minggo 35d50e873d Merge pull request #7633 from CocosRobot/update_lua_bindings_1406785652
[AUTO]: updating luabinding automatically
2014-07-31 14:23:01 +08:00
CocosRobot 095d4ed3c5 [AUTO]: updating luabinding automatically 2014-07-31 05:49:25 +00:00
minggo eb3b58edc4 [ci skip] 2014-07-31 13:44:22 +08:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
add utf8 support for TextField widget
2014-07-31 13:41:57 +08:00
minggo f6985058b7 Merge pull request #7628 from dabingnn/v3_removeConstructAccessMacro
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-31 13:35:32 +08:00
minggo 5f34c14938 Merge pull request #7629 from heliclei/fix-ios-code-sign
fix ios build code sign
2014-07-31 13:34:54 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
heliclei 26cf4321d2 fix ios build code sign 2014-07-30 23:59:19 +08:00
andyque 03368d42f2 refactor, improve imageView stability 2014-07-30 17:29:22 +08:00
andyque e6b85fbd77 fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
andyque 83298171d9 refactor Layout 2014-07-30 16:33:37 +08:00
minggo 7bd68c35d0 Merge pull request #7626 from heliclei/jenkins-pull-request-builder
fix a typo:V3->v3
2014-07-30 16:11:39 +08:00
heliclei add9e3a63e fix typo:V3->v3 2014-07-30 16:11:07 +08:00
andyque 7bcb31f225 refactor loadingBar 2014-07-30 16:08:29 +08:00
andyque c5d2585049 refactor Slider control 2014-07-30 15:52:27 +08:00
minggo e640450104 Merge pull request #7625 from CocosRobot/update_cocosfiles_1406706675
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 15:52:18 +08:00
CocosRobot 6dd02ade69 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 07:51:17 +00:00
minggo 8fe5ea390d Merge pull request #7624 from natural-law/gen-prebuilt-script
Add tools to generate prebuilt engine for Cocos Engine.
2014-07-30 15:49:27 +08:00
zhangbin 5ea318a7df Merge branch 'v3' into gen-prebuilt-script 2014-07-30 15:46:14 +08:00
zhangbin f8a7e70000 Add tools to generate prebuilt engine for Cocos Engine. 2014-07-30 15:44:15 +08:00
andyque 6492167974 refactor ImageView 2014-07-30 15:27:18 +08:00
andyque a6e376f93c refactor UIButton 2014-07-30 15:19:39 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque e7da7b3e42 change unsigned long to size_type 2014-07-30 10:34:37 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00