andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
d12a71f738
|
issue #5057, refactor UILayoutDefine
|
2014-05-09 17:16:11 +08:00 |
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
andyque
|
e8e0d007bd
|
issue #5057, refactor LayoutType
|
2014-05-09 16:49:00 +08:00 |
andyque
|
305f052344
|
issue #5057, refactor LayoutClippingType
|
2014-05-09 16:31:22 +08:00 |
andyque
|
451b7a1b6b
|
issue #5057, refactor UICheckBox event callback
|
2014-05-09 16:04:55 +08:00 |
andyque
|
c5a505ec4c
|
issue #5057, Merge branch 'v3' into refactor5057
Conflicts:
cocos/ui/CocosGUI.h
|
2014-05-09 15:39:02 +08:00 |
andyque
|
d799ffce40
|
issue #5057, remove include dependency
|
2014-05-09 15:32:51 +08:00 |
andyque
|
f070fc335f
|
issue #5057, refactor BrightStyle to strong typed enum
|
2014-05-09 15:23:34 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
andyque
|
57ce0ee2cf
|
issue #5057, refactor addTouchEventListener to std::function<>
|
2014-05-09 14:30:39 +08:00 |
James Chen
|
a0fbe9e737
|
Merge pull request #6649 from CocosRobot/update_cocosfiles_1399614149
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-09 13:45:10 +08:00 |
CocosRobot
|
224b0910c9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-09 05:42:30 +00:00 |
minggo
|
df894931b5
|
Merge pull request #6644 from Dhilan007/v3_video
rename VideoWidget to VideoPlayer.
|
2014-05-09 13:41:06 +08:00 |
andyque
|
7d1cb7af47
|
issue #5057, refactor UILoadingBarTest
|
2014-05-09 11:52:51 +08:00 |
James Chen
|
1a5a29b863
|
Merge pull request #6645 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-09 11:52:11 +08:00 |
zhangbin
|
7d270cd1a1
|
Update the reference of submodule cocos2d-console.
|
2014-05-09 11:48:43 +08:00 |
Dhilan007
|
c904fff9eb
|
update XCode project.pbxproj
|
2014-05-09 11:37:14 +08:00 |
Dhilan007
|
06f264e87d
|
rename VideoWidget to VideoPlayer.
|
2014-05-09 11:30:07 +08:00 |
andyque
|
21e4d05e6e
|
issue #5057, refactor SEL_TouchEvent to std::function
|
2014-05-09 11:28:36 +08:00 |
andyque
|
a699230e75
|
issue #5057, replace license
|
2014-05-09 09:39:18 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
andyque
|
3ef1facfb0
|
issue #5057, replace deprecated enum with strong typed enum
|
2014-05-09 09:29:07 +08:00 |
James Chen
|
1308ad53df
|
Merge pull request #6639 from MSOpenTech/wp8-v3-fix
Added missing files to WP8 projects
|
2014-05-09 08:29:15 +08:00 |
Dale Stammen
|
eea1ba6946
|
added missing files to projects
|
2014-05-08 10:11:42 -07:00 |
James Chen
|
59e1fc39b3
|
Merge pull request #6638 from Dhilan007/v3_video
fixed compilation fails on android.
|
2014-05-08 21:43:21 +08:00 |
Dhilan007
|
24452cada1
|
fixed compilation fails on android.
|
2014-05-08 21:39:53 +08:00 |
James Chen
|
dfd302a8ab
|
Merge pull request #6637 from dumganhar/vs-user-file
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which was set in '.user' file
|
2014-05-08 21:22:37 +08:00 |
James Chen
|
0ed33cacf4
|
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which
was set in '.user' file
|
2014-05-08 21:19:54 +08:00 |
James Chen
|
b550622d90
|
Merge pull request #6636 from CocosRobot/update_cocosfiles_1399545311
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-08 19:13:25 +08:00 |
minggo
|
8a74f83ad0
|
[ci skip]
|
2014-05-08 18:46:34 +08:00 |
CocosRobot
|
7ef529b1c4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-08 10:35:12 +00:00 |
minggo
|
56622dc765
|
Merge pull request #6555 from Dhilan007/v3_video
issue #4859:Add a widget to play video
|
2014-05-08 18:33:51 +08:00 |
Dhilan007
|
52d7d804f7
|
Update XCode project.pbxproj for add files related to VideoWidget.
|
2014-05-08 18:28:28 +08:00 |
andyque
|
fd362d2ace
|
issue #5057. deprcated PositionType and make a new enum class instead
|
2014-05-08 18:25:49 +08:00 |
Dhilan007
|
972f9447dd
|
issue #4876:Add test case to play video
|
2014-05-08 18:14:32 +08:00 |
Dhilan007
|
af26fb9b07
|
issue #4870:Add a ui widget of playing video
|
2014-05-08 18:13:50 +08:00 |
Dhilan007
|
bda73bc7b3
|
issue #4868:Use system widget to play video on iOS
|
2014-05-08 18:12:53 +08:00 |
Dhilan007
|
bda8a73ae5
|
issue #4867:Use system widget to play video on Android
|
2014-05-08 18:12:03 +08:00 |
andyque
|
0c2fd977ea
|
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
Widget and also simplify the enum value
|
2014-05-08 18:10:21 +08:00 |
minggo
|
f12bdeca9a
|
Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug
Fixed bug of guireader
|
2014-05-08 18:06:21 +08:00 |
minggo
|
0ae859e3e1
|
[ci skip]
|
2014-05-08 18:00:01 +08:00 |
minggo
|
56f749f273
|
Merge pull request #6575 from twhittock/lua-main-error-no-launch
Lua template should fail to launch on lua error
|
2014-05-08 17:58:48 +08:00 |
minggo
|
5291bbc377
|
[ci skip]
|
2014-05-08 17:25:41 +08:00 |
minggo
|
c886bf21a8
|
Merge pull request #6631 from Dhilan007/v3_labelhotfixed
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
|
2014-05-08 17:24:08 +08:00 |
minggo
|
2571767907
|
[ci skip]
|
2014-05-08 17:13:21 +08:00 |
minggo
|
d84e26c7b4
|
Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background
sounds pause automatically when switching background
|
2014-05-08 17:11:29 +08:00 |
minggo
|
9f0e25d808
|
Merge pull request #6628 from andyque/refactor5056
refactor 5056. pull gui tests from ExtensionTest to UITest
|
2014-05-08 17:00:38 +08:00 |
Ryeeeeee
|
80103487fe
|
rename variable
|
2014-05-08 16:53:24 +08:00 |