Commit Graph

30 Commits

Author SHA1 Message Date
zilongshanren 60f8d20c82 add opacity support to drawnode 2017-01-23 16:59:45 +08:00
zilongshanren 0a3ee883f9 make code more robost 2017-01-13 14:24:02 +08:00
zilongshanren bc364fb3bb fix label outline toggle 2017-01-13 14:12:32 +08:00
zilongshanren d76dae6409 add label outline effect to mac 2016-12-30 18:08:13 +08:00
zilongshanren c8a6529bb6 only substract kerning when needed 2016-12-28 14:06:41 +08:00
zilongshanren cdf356e98e fix bmfont trim rendering edge cases 2016-12-23 18:09:11 +08:00
zilongshanren 382de63d07 bmfont spriteframe respect trim 2016-12-22 09:49:41 +08:00
zilongshanren 34a36fcd4a retain fnt spriteframe 2016-12-21 17:28:57 +08:00
zilongshanren 837b625204 rename function args 2016-12-21 17:14:14 +08:00
zilongshanren 83d61dcbf7 add bitmap font batch rendering 2016-12-21 16:51:04 +08:00
zilongshanren 89d5f99d46 fix richtext custom font issue 2016-12-12 17:07:39 +08:00
zilongshanren dde96c63df fix label size 2016-11-25 14:33:26 +08:00
zilongshanren 238de22b34 make jsb label content size compatiable with web 2016-11-23 14:49:50 +08:00
zilongshanren c4bb1764ca fix bmfont setColor asset error 2016-11-16 11:37:28 +08:00
zilongshanren 9b5382eaa6 fix label outline color 2016-11-11 14:12:44 +08:00
zilongshanren 60e1033188 fix system font rendering issue 2016-10-24 16:35:22 +08:00
zilongshanren 1a34550c01 fix label font color issue 2016-10-22 09:33:47 +08:00
zilongshanren c6aac0fd85 fix label italics width 2016-09-12 14:06:24 +08:00
pandamicro fcbcce65d8 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/CCDevice-android.cpp
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	cocos/platform/ios/CCDevice-ios.mm
	cocos/platform/mac/CCDevice-mac.mm
	cocos/platform/win32/CCDevice-win32.cpp
2016-08-31 14:39:08 +08:00
zilongshanren ae35fc46f5 improve system font underline 2016-08-31 10:46:14 +08:00
zilongshanren 96d066204d add bold support for mac 2016-08-30 14:41:59 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
pandamicro 8642f8ef74 Upgrade cocos/2d to v3.13 2016-08-04 11:59:26 +08:00
zilongshanren c2e5a97f6a add system font label overflow 2016-06-12 17:43:02 +08:00
Wenhai Lin 0449d57993 refine 2016-05-12 16:31:16 +08:00
Wenhai Lin a50b000b17 Fixed memory leak and warns 2016-04-21 23:47:26 +08:00
2youyouo2 a6db08343c sync cocos2d/cocos2d-x#15293 2016-04-12 10:29:43 +08:00
WenhaiLin e31a6e6196 Fixed compile fail on window 2016-04-08 18:43:44 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00