Commit Graph

32 Commits

Author SHA1 Message Date
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
Wenhai Lin 342c582124 Fixed label may become white/black block after resume from background on android 2015-01-21 21:58:18 +08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
minggo 17ab047b7d fix compiling error on windows 2014-08-27 15:13:41 +08:00
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
James Chen 5fda13639d issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08: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
Dhilan007 408107ff24 closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
Dhilan007 538c01e76e label:support clip blank of upper and lower margin. 2014-03-24 14:16:27 +08:00
andyque 957eb9363e fix win32 compile error 2014-03-20 13:42:09 +08:00
andyque ca6851f114 fix warnings of font and RichText 2014-03-20 11:58:36 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
Dhilan007 23501b40aa issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline 2014-03-05 15:54:40 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Dhilan007 2ad81b0edb closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture. 2014-02-18 14:30:51 +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 d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
Ricardo Quesada 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
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 49d7bbd600 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00