andyque
|
74f0b3b436
|
add bmfont test
|
2015-05-27 16:58:52 +08:00 |
andyque
|
0352a7a3ea
|
add Android 9-patch image format support
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
|
2015-05-21 16:04:37 +08:00 |
samuele3hu
|
562c711cda
|
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
|
2015-05-15 18:26:21 +08:00 |
yusheng.lu
|
60190a1be6
|
changed csb names in ccs-res to shorter
|
2015-05-14 18:08:37 +08:00 |
Dale Stammen
|
351a898a70
|
removed CC_PLATFORM_WP8
|
2015-05-08 09:19:13 -07:00 |
Dale Stammen
|
4d7e6567ea
|
Use TextBMFont when text is updated from slider for faster performance
|
2015-04-27 19:48:15 -07:00 |
samuele3hu
|
47e2698986
|
Fix the cocos3.6beta0 bugs
|
2015-04-22 10:20:21 +08:00 |
minggo
|
3c7d5afce2
|
Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
|
2015-04-16 18:16:28 +08:00 |
WenhaiLin
|
fc75f46abb
|
Fix crash when play streamed MP4 file.
|
2015-04-16 16:27:09 +08:00 |
andyque
|
8a9f420735
|
fix side effect of ui::button clone
|
2015-04-16 14:38:00 +08:00 |
andyque
|
3c3d76fd9e
|
remove listview focus test
|
2015-04-14 17:48:43 +08:00 |
andyque
|
10c90b06aa
|
fix ui::Text outline don't change content size
|
2015-04-10 15:33:48 +08:00 |
andyque
|
c8d8a0d220
|
add disableEffect API for ui::Text
|
2015-04-10 14:18:16 +08:00 |
Ricardo Quesada
|
23b0d4d2f6
|
more fixes with the namespaces
|
2015-04-08 21:23:47 -07:00 |
Ricardo Quesada
|
51374eb822
|
tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
|
2015-04-08 17:37:30 -07:00 |
WenhaiLin
|
0d51c13743
|
Make all test cases work fine with new test framework.
|
2015-04-03 14:31:03 +08:00 |
pipu
|
bc7d8f0a09
|
Add method destroyCocosStudio() for CocoStudio
|
2015-03-31 19:55:56 +08:00 |
pipu
|
a0a461f319
|
Supplement some Reader.
|
2015-03-31 11:22:34 +08:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Huabing.Xu
|
29c4c744ac
|
fix compile error on cpp-tests release mode
|
2015-01-28 15:34:28 +08:00 |
minggo
|
8d681dfe7d
|
Merge pull request #10218 from andyque/fixIssue10183
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
|
2015-01-28 09:57:34 +08:00 |
minggo
|
880abfe814
|
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
Fix loading bar reload texture issue
|
2015-01-27 13:50:38 +08:00 |
andyque
|
95e8072afa
|
fixed issue #10183
|
2015-01-26 18:26:59 +08:00 |
andyque
|
12cf9da486
|
improve loadingbar test
|
2015-01-26 14:46:45 +08:00 |
andyque
|
0e67cfcbff
|
improve loading Bar Test
|
2015-01-26 14:39:44 +08:00 |
andyque
|
fdbf84a118
|
add uploading switch scale9 tests
|
2015-01-26 13:49:54 +08:00 |
Wenhai Lin
|
81198583f1
|
Fixed sets the page's base URL for WebView doesn't work.
|
2015-01-23 18:30:12 +08:00 |
yusheng.lu
|
bec9b0e6b3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-01-21 17:14:16 +08:00 |
yusheng.lu
|
304f28a58a
|
Update the csb resources for current Cocos2d-x
|
2015-01-21 17:08:16 +08:00 |
andyque
|
d58426db99
|
fix button pressAction scale issue
|
2015-01-21 14:54:37 +08:00 |
minggo
|
11ff48416f
|
Merge pull request #10060 from doomsdayer/v3_layout_test
Updated the Layout Component demo
|
2015-01-21 11:11:44 +08:00 |
minggo
|
dca1edccd7
|
Merge pull request #10113 from liamcindy/Scale9Error
update for ui object scale9 state refresh
|
2015-01-21 10:51:55 +08:00 |
Liam
|
902fba0638
|
fix slider and loadingbar scale9 error
|
2015-01-20 20:57:54 +08:00 |
yusheng.lu
|
858bafdae9
|
Removed the unused variable to make XCode compile pass.
|
2015-01-20 19:56:00 +08:00 |
WenhaiLin
|
ef55ccdbeb
|
Fixed UIEditBoxTest display error font size
|
2015-01-20 18:08:17 +08:00 |
Liam
|
a42d213d16
|
update for ui object scale9 state refresh
|
2015-01-20 17:24:04 +08:00 |
yusheng.lu
|
bba8d6481f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test
|
2015-01-19 10:05:39 +08:00 |
minggo
|
45c4c16f93
|
Merge pull request #10010 from andyque/fixErrorFontName
fix font name typo in tests
|
2015-01-15 10:24:02 +08:00 |
andyque
|
f8200347cd
|
fix font name typo in tests
|
2015-01-15 10:10:53 +08:00 |
WenhaiLin
|
13b049a543
|
Fixed warns:truncation from double to float
|
2015-01-15 10:07:23 +08:00 |
yusheng.lu
|
eb106d57a6
|
layout component test
|
2015-01-14 11:34:43 +08:00 |
andyque
|
32450ae9a3
|
fix empty http string
|
2015-01-12 16:16:39 +08:00 |
minggo
|
491d36c62b
|
Merge pull request #9626 from liamcindy/CocoReader
update for cocos reader
|
2014-12-26 09:29:37 +08:00 |
andyque
|
29e9ef7edf
|
Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
|
2014-12-25 18:08:07 +08:00 |
Liam
|
fa85faec68
|
update for cocos reader
|
2014-12-25 15:02:22 +08:00 |
Liam
|
83fcf74882
|
update for code format
|
2014-12-24 10:56:01 +08:00 |
andyque
|
d8f726bc4f
|
modify widget default behavior
|
2014-12-23 15:03:31 +08:00 |
Liam
|
2991b57ec6
|
update lay out reader and samples
|
2014-12-22 18:24:06 +08:00 |
Liam
|
8b32193e04
|
reset unused format changed
|
2014-12-22 15:15:40 +08:00 |
Liam
|
7c4d31feab
|
update for lay out samples
|
2014-12-22 14:51:50 +08:00 |