Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,513 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

68 Commits

Author SHA1 Message Date
Dhilan007 df21bbf7df 1.remove unused code 
2.reduce calculation amount.
3.reduces expenses of function calls
 2014-01-22 14:57:11 +08:00
Hanju Kim 64ab0c0e35 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontDefinition.cpp
 2014-01-22 14:15:21 +09:00
Dhilan007 697b0289c7 close #3805:fix wrap error and alignment error. 2014-01-21 17:55:49 +08:00
Dhilan007 f22e4d474f move some method to FontFreeType that only relating to FontFreeType from Font. 2014-01-21 10:36:32 +08:00
Hanju Kim 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
Dhilan007 a0b86abcf4 close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage. 2014-01-20 10:32:12 +08:00
Dhilan007 db4dc28c1a close #3678:fix incorrect spacing between characters 2014-01-17 14:04:52 +08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -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
Hanju Kim 567455dd38 convert tab to space 2014-01-13 21:28:42 +09:00
Hanju Kim b45abf3f2d Bug fixes for new label 2014-01-13 21:14:50 +09: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
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +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