Commit Graph

15 Commits

Author SHA1 Message Date
samuele3hu 1d4d1f251c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen
Conflicts:
	cocos2dx/label_nodes/CCLabel.h
2013-09-13 14:04:22 +08:00
samuele3hu 5ddd9ae23c issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
minggo c4cb2582cc fixed #2793:best practice of New Label 2013-09-13 11:46:46 +08:00
carlo morgantini 16412fc885 more cleanup 2013-08-06 13:43:29 -07:00
carlo morgantini d1915d47cc some more refactoring and cleaning up 2013-08-05 15:56:18 -07:00
carlo morgantini b14f9f83e9 New label stuff cleanup and re factoring 2013-08-05 15:11:07 -07:00
carlo morgantini 2fb2916bae some more cleanup 2013-08-01 14:36:34 -07:00
carlo morgantini 7d141a3f57 the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore) 2013-07-25 17:58:13 -07:00
carlo morgantini 97363c9382 some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
carlo morgantini 5068622c04 working on the new atlas stuff 2013-07-19 10:33:26 -07:00
carlo morgantini 5480810a9c clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -07:00
carlo morgantini 80247d409b rendering using free type. This commit is a work in progress and should NOT be used 2013-07-17 17:31:28 -07:00
carlo morgantini 9cfe1b7823 new stuff for FreeType 2013-07-16 15:18:39 -07:00
carlo morgantini 002ae77698 new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
carlo morgantini 9264b3de1d more clean up 2013-07-10 11:59:05 -07:00