WenhaiLin
|
c60112a634
|
Text:Fixed the scale factor may be incorrect with multiline text.
|
2015-05-28 11:56:43 +08:00 |
Shrimpz
|
38a6aa30a2
|
* fixed android crash that a Label instance add to an invisibility parent node.
|
2014-11-27 10:59:47 +08:00 |
Dhilan007
|
e071e5c896
|
Fix Label may display incomplete for multiline text with outline feature enabled.
|
2014-11-12 17:24:35 +08:00 |
minggo
|
23f922420a
|
Merge pull request #8919 from ahlwong/v3
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
|
2014-10-27 11:48:50 +08:00 |
Ahlwong
|
dfcdf10898
|
Fix Label Additional Kerning All Strings
|
2014-10-24 08:57:37 -07:00 |
Ahlwong
|
012683bf6e
|
Fix kerning on signle characters
|
2014-10-23 21:18:51 -07:00 |
Dhilan007
|
0bb02fb34f
|
Fix Label: endless loop if not using system font, and constrained length is less than one character width
|
2014-10-20 10:41:01 +08:00 |
Dhilan007
|
8ea473de7b
|
fix endless loop when dimensions that are not enough to fit one character
|
2014-10-08 18:22:35 +08:00 |
Dhilan007
|
8ac1398037
|
fixed text line wrap issue in UITextField.
|
2014-07-17 16:23:38 +08:00 |
Dhilan007
|
3511d1e87e
|
1.Support setting up the line height and additional kerning of label.
2.Add more annotation
|
2014-06-12 12:01:15 +08:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
Dhilan007
|
fc72dc040d
|
Label:fixed wrong logic of alignment.
|
2014-05-12 14:34:25 +08:00 |
Dhilan007
|
4692c67b78
|
issue #4660:remove unnecessary API.
|
2014-05-10 19:33:05 +08:00 |
James Chen
|
5fda13639d
|
issue #4660: Uses new utf api for Label.
|
2014-05-10 19:24:03 +08:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
Dhilan007
|
538c01e76e
|
label:support clip blank of upper and lower margin.
|
2014-03-24 14:16:27 +08:00 |
Dhilan007
|
4905acfa0b
|
label:fixed vertical alignment is incorrect.
|
2014-03-07 18:31:33 +08:00 |
Dhilan007
|
ac944cd42b
|
fixed incorrect display when the size of label not enough to support display all text.
|
2014-03-07 15:58:49 +08:00 |
Dhilan007
|
c233b636cd
|
closed #4301:Label support vertical alignment and assign dimensions.
|
2014-03-07 14:58:44 +08:00 |
Dhilan007
|
fd528b389d
|
fix warning
|
2014-02-20 10:24:35 +08:00 |
Dhilan007
|
ddd02b463c
|
optimize label:
1.remove unnecessary API
2.reduces object-creation and function calls.
|
2014-02-19 20:26:14 +08:00 |
Dhilan007
|
47e16728cc
|
reduce unnecessary calculation amount.
|
2014-02-10 12:38:32 +08:00 |
Dhilan007
|
e12c1f57ac
|
Label::reduce unnecessary calculation amount.
|
2014-02-10 11:21:54 +08:00 |
Pisces000221
|
c9e4944321
|
Fix one character disappears when breaking line
|
2014-02-08 15:18:18 +08:00 |
Pisces000221
|
da2a58ccc9
|
Improved formatting when using both CJK and ASCII
|
2014-02-08 15:05:36 +08:00 |
Dhilan007
|
771ed300c4
|
close #3642:fix bounding box of new label is incorrect.
|
2014-01-24 14:04:08 +08:00 |
Dhilan007
|
ec297a2c31
|
close #3642:fix bounding box of new label is incorrect.
|
2014-01-22 18:01:37 +08:00 |
Dhilan007
|
a2f5146731
|
close #3642:fix bounding box of the new label is a bit off.
|
2014-01-22 17:45:56 +08:00 |
Dhilan007
|
df21bbf7df
|
1.remove unused code
2.reduce calculation amount.
3.reduces expenses of function calls
|
2014-01-22 14:57:11 +08:00 |
Dhilan007
|
697b0289c7
|
close #3805:fix wrap error and alignment error.
|
2014-01-21 17:55:49 +08:00 |
Ricardo Quesada
|
a74a524eaa
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes
|
2014-01-16 21:36:22 -08:00 |
Ricardo Quesada
|
d0dbf34319
|
removes "include "cocos2d.h" from cocos2d files
|
2014-01-16 21:35:58 -08:00 |
Dhilan007
|
f5afa09de1
|
remove unneeded empty line.
|
2014-01-17 09:46:59 +08:00 |
Dhilan007
|
18bd978480
|
1.add label crash test
2.fix lose char when label have unknown character.
|
2014-01-16 14:37:07 +08:00 |
Dhilan007
|
afe49b3a2b
|
1.Fix crash bug when using unknown character
2.Fix text align mistake
|
2014-01-16 11:47:06 +08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
Dhilan007
|
b51efbd654
|
fix align text error in label
|
2013-12-31 14:13:26 +08:00 |
James Chen
|
febc19ea8d
|
Some warning fixes on linux.
|
2013-12-26 23:06:16 -08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
minggo
|
fa7c97171b
|
fix some warnings
|
2013-12-06 16:32:06 +08:00 |
boyu0
|
6c1144ee79
|
issue #2770: fix some warning
|
2013-11-11 12:49:38 +08:00 |
Dhilan007
|
b8faaeba59
|
issus #2893:improve new label
|
2013-10-31 17:52:22 +08:00 |
Dhilan007
|
12db6a32ab
|
issues #2893:
1.Texture atlas are create on demand, based on the characters used in the label.
2.Create Quads (and not sprites) for each letter.
|
2013-10-31 10:49:37 +08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |