Commit Graph

13 Commits

Author SHA1 Message Date
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
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 ef919aea91 more cleanup 2013-08-06 14:37:19 -07:00
carlo morgantini c7c0b0e07a more cleanup 2013-08-05 17:49:20 -07:00
carlo morgantini a1168512f6 cleanup 2013-08-05 16:41:23 -07:00
carlo morgantini 03b1c0142b refactoring 2013-08-05 16:35:15 -07:00
carlo morgantini b14f9f83e9 New label stuff cleanup and re factoring 2013-08-05 15:11:07 -07:00
carlo morgantini 023b46154f Fix problems with missing glyphs in .ttf file 2013-07-29 13:43:23 -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