059ea3dd8a
label's small improvement.
2014-05-14 16:41:26 +08:00
3a30adde0f
issue #4660 : A warning fix in CCFontAtlas.cpp
2014-05-10 19:33:05 +08:00
5fda13639d
issue #4660 : Uses new utf api for Label.
2014-05-10 19:24:03 +08:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
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
8f14597717
check if _currentUTF16String is null
2014-04-19 09:38:45 -07:00
61134426a8
Some fixes detected by xcode analyze
2014-04-09 20:41:09 +08:00
408107ff24
closed #4494::Easy to sets texture parameters of label's cache textures.
2014-03-27 15:35:51 +08:00
cac4e0bbbc
closed #4569:Texture2D support for update partial texture
2014-03-27 15:11:04 +08:00
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
538c01e76e
label:support clip blank of upper and lower margin.
2014-03-24 14:16:27 +08:00
294341d0ab
fixed texture memory leak and added comments to indicate problem
2014-03-22 05:56:08 -07:00
ca6851f114
fix warnings of font and RichText
2014-03-20 11:58:36 +08:00
5f6fbc6a33
label:fixed getter for font size and font name.
2014-03-14 15:18:45 +08:00
971b1dd557
Label:fixed text display incorrect when come to foreground on android.
2014-03-14 14:59:26 +08:00
063bde51c3
fixed #4300:fixed Label:draw location and BBOX is incorrect.
2014-03-07 11:42:13 +08:00
dfdf19daff
remove unused shader and also did adjust FontAtlas::getTexture
2014-03-05 16:51:16 +08:00
23501b40aa
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
2014-03-05 15:54:40 +08:00
2ad81b0edb
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
2014-02-18 14:30:51 +08:00
771ed300c4
close #3642:fix bounding box of new label is incorrect.
2014-01-24 14:04:08 +08:00
39904e304d
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-01-23 15:57:25 +09:00
4095ab36b6
update xcode project.
2014-01-22 15:22:46 +08:00
df21bbf7df
1.remove unused code
...
2.reduce calculation amount.
3.reduces expenses of function calls
2014-01-22 14:57:11 +08:00
64ab0c0e35
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontDefinition.cpp
2014-01-22 14:15:21 +09:00
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +08:00
f22e4d474f
move some method to FontFreeType that only relating to FontFreeType from Font.
2014-01-21 10:36:32 +08:00
a8f21761a7
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontAtlas.cpp
cocos/2d/CCFontDefinition.cpp
cocos/base/CCConsole.cpp
2014-01-20 16:03:16 +09:00
a0b86abcf4
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-20 10:32:12 +08:00
db4dc28c1a
close #3678:fix incorrect spacing between characters
2014-01-17 14:04:52 +08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
afe49b3a2b
1.Fix crash bug when using unknown character
...
2.Fix text align mistake
2014-01-16 11:47:06 +08:00
567455dd38
convert tab to space
2014-01-13 21:28:42 +09:00
b45abf3f2d
Bug fixes for new label
2014-01-13 21:14:50 +09:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
b8faaeba59
issus #2893:improve new label
2013-10-31 17:52:22 +08:00
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
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
Dhilan007