andyque
|
7abea5dc58
|
add utf8 support for UITextField
|
2014-07-30 10:34:37 +08:00 |
andyque
|
955da5d3cc
|
move utf8_substr to ui::helper class.
|
2014-07-30 10:34:37 +08:00 |
andyque
|
c5ca0dbf10
|
fix android and linux compile error
|
2014-07-29 16:24:27 +08:00 |
andyque
|
1daaea1410
|
remove extension::Scale9Sprite dependency
|
2014-07-29 16:24:27 +08:00 |
andyque
|
ebf05d1acc
|
add UIScale9Sprite tests
|
2014-07-29 16:24:27 +08:00 |
boyu0
|
1b6cda488a
|
add ParticleResetTotalParticles test.
|
2014-07-29 11:21:11 +08:00 |
minggo
|
b2e705acd8
|
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
fix remove self in Widget touch callback issue
|
2014-07-28 14:04:20 +08:00 |
andyque
|
7353f8685a
|
Simplify Widget ContentSize cascade change algorithm
|
2014-07-25 14:59:58 +08:00 |
andyque
|
e56e015be2
|
minor modification of tests
|
2014-07-25 14:40:58 +08:00 |
andyque
|
3502cb0a23
|
fix remove self in Widget touch callback issue
|
2014-07-25 14:23:04 +08:00 |
minggo
|
20e3a61524
|
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
mac custom font fix v2
|
2014-07-25 11:38:38 +08:00 |
minggo
|
b0c922d91e
|
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
Refactor #5580: Add new file&directory apis into FileUtils and test cases
|
2014-07-24 22:18:10 +08:00 |
Sergey
|
92ac809bfe
|
Mac fonts tests
|
2014-07-24 12:27:17 +04:00 |
andyque
|
21f1624462
|
minor fix of RichText
|
2014-07-23 14:10:00 +08:00 |
minggo
|
524d9cb8af
|
Merge pull request #7552 from andyque/fixScale9Sprite
fix scale9Sprite addChild zorder issue
|
2014-07-22 18:39:04 +08:00 |
andyque
|
1f4c289db4
|
fix scale9Sprite addChild zorder issue
|
2014-07-22 16:26:40 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
pandamicro
|
d2c6602dea
|
Refactor #5580: Merge createDirectories to createDirectory
|
2014-07-21 16:51:48 +08:00 |
minggo
|
21647839b6
|
Merge pull request #7515 from Dhilan007/v3-320final
fixed warn and replace 'printf' with 'log';
|
2014-07-18 13:56:54 +08:00 |
LinWenhai
|
c10e49201d
|
fixed compil
|
2014-07-18 13:44:07 +08:00 |
Dhilan007
|
5d22bca240
|
fixed warn and replace 'printf' with 'log';
|
2014-07-18 10:20:37 +08:00 |
Dale Stammen
|
88da5d5fdb
|
disabled custom shader tests for WP8
|
2014-07-17 08:13:49 -07:00 |
andyque
|
7ff78c61ba
|
fix richText UTF8
|
2014-07-17 18:36:09 +08:00 |
minggo
|
578af01ef1
|
Merge pull request #7499 from andyque/fixRichTextUTF8
fix richText utf8 error
|
2014-07-17 17:57:41 +08:00 |
andyque
|
fc2ab110cc
|
fix richText utf8 error
|
2014-07-17 17:58:40 +08:00 |
zhangcheng
|
6d0bf8e143
|
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
|
2014-07-17 17:25:32 +08:00 |
zhangcheng
|
24d87ad05b
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +08:00 |
minggo
|
c482e2e14f
|
Merge pull request #7491 from Dhilan007/v3-320final
fixed text line wrap issue in UITextField.
|
2014-07-17 16:48:41 +08:00 |
Dhilan007
|
8ac1398037
|
fixed text line wrap issue in UITextField.
|
2014-07-17 16:23:38 +08:00 |
geron-cn
|
4e9a710053
|
fix binary test crash bug
|
2014-07-17 16:16:49 +08:00 |
geron-cn
|
441f0ebca8
|
fix binary test crash bug
|
2014-07-17 16:13:12 +08:00 |
geron-cn
|
1a2caaeebf
|
fix binary test crash bug
|
2014-07-17 16:09:17 +08:00 |
geron-cn
|
8212ed3822
|
fix binary test crash bug
|
2014-07-17 16:01:03 +08:00 |
andyque
|
4f5cd2a368
|
change FastTileMap to TileMap
|
2014-07-17 14:09:53 +08:00 |
minggo
|
c6349ef246
|
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
disable FastTileMapTest on WP8
|
2014-07-17 13:35:52 +08:00 |
vision
|
c29766a4ad
|
disable FastTileMapTest on WP8
|
2014-07-17 12:56:58 +08:00 |
minggo
|
5a5b245e84
|
Merge pull request #7474 from andyque/fixFastTileMap
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:52:40 +08:00 |
andyque
|
880c2c4c3f
|
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:46:20 +08:00 |
minggo
|
4c7d777f25
|
Merge pull request #7471 from visiblelight/wp8_shader_update
Wp8 shader update
|
2014-07-17 10:14:54 +08:00 |
vision
|
40951d586c
|
update
|
2014-07-17 10:10:33 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +08:00 |
minggo
|
a653d0eb28
|
Merge pull request #7440 from boyu0/add_utils_atof
Add utils::atof(), fix bug: particle not shown on android.
|
2014-07-17 09:59:15 +08:00 |
zhangcheng
|
8bf4c8b6c9
|
1. Fixes CCTimeLine warning.
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
|
2014-07-15 18:07:33 +08:00 |
andyque
|
714048059c
|
fix loading bar switch loading method issue
|
2014-07-15 17:03:35 +08:00 |
andyque
|
52596dc97f
|
fix Text line wrap issue
|
2014-07-15 11:46:53 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
minggo
|
6d063fb97b
|
Merge pull request #7431 from andyque/addTextFieldTTFTest
add TextField TrueTypeFont tests
|
2014-07-14 16:31:36 +08:00 |
Dhilan007
|
a5317dde87
|
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
|
2014-07-14 15:50:20 +08:00 |
andyque
|
4fe3723edf
|
add TextField TrueTypeFont tests
|
2014-07-14 14:29:28 +08:00 |
minggo
|
3b59b41116
|
3D:Sprite3D -> Node:Sprite3D
|
2014-07-12 22:26:46 +08:00 |