minggo
|
aa0387c05c
|
Merge pull request #7009 from CocosRobot/update_cocosfiles_1402283562
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 11:41:38 +08:00 |
minggo
|
81b80593e1
|
Merge pull request #7010 from CocosRobot/update_lua_bindings_1402283659
[AUTO]: updating luabinding automatically
|
2014-06-09 11:41:17 +08:00 |
CocosRobot
|
638f7f12c5
|
[AUTO]: updating luabinding automatically
|
2014-06-09 03:15:50 +00:00 |
CocosRobot
|
70a4fd173c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 03:12:43 +00:00 |
minggo
|
24f7c9019a
|
Merge pull request #7005 from andyque/refactorUITouchEvent
refactor UI framework touch handling
|
2014-06-09 11:11:40 +08:00 |
minggo
|
19a96c66fb
|
Merge pull request #7007 from CocosRobot/update_cocosfiles_1402282382
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 10:53:33 +08:00 |
CocosRobot
|
b2ca17e00b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 02:53:03 +00:00 |
minggo
|
e057a6c7c7
|
Merge pull request #7006 from natural-law/v3
Update the reference of submodule plugin-x.
|
2014-06-09 10:51:56 +08:00 |
andyque
|
6bc82ef5ab
|
restore UIScrollView constructor and destructor to public
|
2014-06-09 10:47:02 +08:00 |
andyque
|
c4f5e71bbd
|
restore Widget's constructor and destructor to public
|
2014-06-09 10:41:17 +08:00 |
andyque
|
1a933807b5
|
remove UIInterface.h header file
|
2014-06-09 10:35:54 +08:00 |
zhangbin
|
5ec3c71b8c
|
Update the reference of submodule plugin-x.
|
2014-06-09 10:23:40 +08:00 |
andyque
|
7a25fbfe29
|
refactor touch event
|
2014-06-09 10:23:11 +08:00 |
minggo
|
0cd42a3f39
|
Merge pull request #7002 from CocosRobot/update_lua_bindings_1402278357
[AUTO]: updating luabinding automatically
|
2014-06-09 09:47:33 +08:00 |
minggo
|
46ed99f611
|
Merge pull request #7001 from CocosRobot/update_lua_bindings_1402278332
[AUTO]: updating luabinding automatically
|
2014-06-09 09:47:10 +08:00 |
CocosRobot
|
c1b7b76f92
|
[AUTO]: updating luabinding automatically
|
2014-06-09 01:47:01 +00:00 |
minggo
|
575c5101c7
|
Merge pull request #6999 from iSevenDays/patch-12
fix assertions
|
2014-06-09 09:46:55 +08:00 |
CocosRobot
|
c604c09069
|
[AUTO]: updating luabinding automatically
|
2014-06-09 01:46:34 +00:00 |
minggo
|
7e6fc3b9ac
|
Merge pull request #7000 from iSevenDays/patch-13
Possible use of null pointer.
|
2014-06-09 09:46:14 +08:00 |
minggo
|
fa74de8511
|
Merge pull request #6993 from Teivaz/v3
* Set COCOS2D_VERSION to 3.2.0
|
2014-06-09 09:43:50 +08:00 |
minggo
|
ccff80df2f
|
Merge pull request #6991 from andyque/fixUIFrameColorAndOpacity
fix UI frame cascade color and opacity
|
2014-06-09 09:42:47 +08:00 |
Anton Sokolchenko
|
1a16dd02f8
|
Possible use of null pointer.
Or maybe better to add CCASSERT.
|
2014-06-09 02:12:17 +03:00 |
Anton Sokolchenko
|
3edef12094
|
Update CCControlButton.cpp
|
2014-06-09 02:07:43 +03:00 |
Anton Sokolchenko
|
f5efc49903
|
fix assertions
'label' could be not caught after previous assertions
|
2014-06-09 02:04:44 +03:00 |
oleksandr.kuznietsov
|
2640938c68
|
* Set COCOS2D_VERSION to 3.2.0
|
2014-06-06 12:58:32 +03:00 |
andyque
|
8962f7fc2e
|
refactor Scale9Sprite setColor & setOpacity
|
2014-06-06 16:15:19 +08:00 |
andyque
|
4f22b03d7f
|
refactor Widget setColor & setOpacity
|
2014-06-06 16:14:35 +08:00 |
andyque
|
282264575b
|
refactor TextField setColor & setOpacity
|
2014-06-06 16:10:33 +08:00 |
andyque
|
5ae97da030
|
refactor TextBMFont setColor & setOpacity
|
2014-06-06 16:09:59 +08:00 |
andyque
|
d615de8299
|
refactor TextAtlas setColor & setOpacity
|
2014-06-06 16:09:13 +08:00 |
andyque
|
a37a6737ca
|
refactor Text setColor & setOpacity
|
2014-06-06 16:08:31 +08:00 |
andyque
|
f0f4d41813
|
refactor Slider setColor & setOpacity
|
2014-06-06 16:07:47 +08:00 |
andyque
|
3c80fe53d3
|
refactor LoadingBar setColor & setOpacity
|
2014-06-06 16:03:59 +08:00 |
andyque
|
6193893b2b
|
refactor ImageView setColor & setOpacity
|
2014-06-06 16:02:44 +08:00 |
andyque
|
0805c215b3
|
refactor UICheckBox setColor & setOpacity
|
2014-06-06 16:01:55 +08:00 |
andyque
|
46ad4edab3
|
refactor UIButton setColor & setOpacity
|
2014-06-06 16:00:28 +08:00 |
minggo
|
76d9916864
|
Merge pull request #6990 from Dhilan007/v3-wp8fix
fixed WP8 project:compile error,missing files,wrong file path.
|
2014-06-06 15:43:43 +08:00 |
Dhilan007
|
fd4e233432
|
fixed WP8 project:compile error,missing files,wrong file path.
|
2014-06-06 15:41:17 +08:00 |
minggo
|
716769241a
|
Merge pull request #6938 from CaryZheng/v3
Simplify BlendFunc operator< judgement
|
2014-06-06 15:29:33 +08:00 |
minggo
|
bd00e17190
|
[ci skip]
|
2014-06-06 13:47:38 +08:00 |
minggo
|
e0238c107e
|
[ci skip]
|
2014-06-06 13:41:40 +08:00 |
minggo
|
6771afb13b
|
Merge pull request #6989 from samuele3hu/v3_fix
Update cocos2d-console submodule
|
2014-06-06 13:38:46 +08:00 |
minggo
|
4016c3aa84
|
Merge pull request #6988 from minggo/add-comment
[ci skip]add some comment
|
2014-06-06 12:11:02 +08:00 |
minggo
|
bbff18c96f
|
add some comment
|
2014-06-06 12:09:39 +08:00 |
samuele3hu
|
52323b27fa
|
Update cocos2d-console submodule
|
2014-06-06 12:09:10 +08:00 |
minggo
|
49f7b2aec1
|
Merge pull request #6986 from iSevenDays/patch-11
Fix CCImage to be compatible with UNIX2003
|
2014-06-06 12:05:58 +08:00 |
minggo
|
ab63569e4a
|
Merge pull request #6987 from samuele3hu/v3_fix
Update control.lua for lua-tests
|
2014-06-06 12:04:07 +08:00 |
samuele3hu
|
890bc20475
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-06-06 11:44:23 +08:00 |
samuele3hu
|
5ab8b81205
|
Update control.lua for lua-tests
|
2014-06-06 11:42:18 +08:00 |
minggo
|
11320a0ef5
|
[ci skip]
|
2014-06-06 11:40:32 +08:00 |