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

12 Commits

Author SHA1 Message Date
James Chen c61da90441 Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 13:40:59 +08:00
carlo morgantini 73286ad76b some more clean up (code review) 2013-08-02 16:11:20 -07:00
James Chen 67d710a41c Adding Android support for new label. 2013-08-02 13:46:26 +08:00
carlo morgantini ff56ad5435 fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
carlo morgantini 023b46154f Fix problems with missing glyphs in .ttf file 2013-07-29 13:43:23 -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 5668607e0e merging with Ricardo stuff and fixin the new Label 2013-07-22 11:40:39 -07:00
Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared
 2013-07-19 16:04:23 -07:00
carlo morgantini 5480810a9c clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -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