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

16 Commits

Author SHA1 Message Date
carlo morgantini 9de1ef3f97 New label TTF. New text alignment sample. 2013-07-30 10:27:22 -07:00
carlo morgantini 6e4aafdacf fix a problem with the new Label and colors 2013-07-26 16:30:36 -07:00
carlo morgantini 23575f0a68 New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
carlo morgantini e34a0affa8 more cleaning 2013-07-26 10:43:17 -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 98bb0c26f3 working on the new label stuff 2013-07-22 14:43:45 -07:00
Ricardo Quesada 2219bde542 bmfont sample working 
...still TTF working OK
 2013-07-19 16:49:51 -07:00
carlo morgantini c977e6c3fa Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 
Conflicts:
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontDefinition.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	cocos2dx/label_nodes/CCStringTTF.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-07-19 12:24:25 -07:00
carlo morgantini 9f629835de some more cleanup 2013-07-19 11:19:35 -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
Ricardo Quesada f9268c8054 small API changes 
::create()
and const chars
 2013-07-15 14:35:25 -07:00
carlo morgantini e4af13f1f6 use freetype 2013-07-12 12:39:47 -07:00
carlo morgantini a034d5bff5 ready to integrate FreeType 2013-07-11 17:17:29 -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