zilongshanren
|
9030bb572a
|
fix mac label outline
|
2017-01-04 17:07:30 +08:00 |
|
zilongshanren
|
d76dae6409
|
add label outline effect to mac
|
2016-12-30 18:08:13 +08:00 |
|
zilongshanren
|
1a34550c01
|
fix label font color issue
|
2016-10-22 09:33:47 +08:00 |
|
pandamicro
|
651551055a
|
Fix mac simulator
|
2016-09-02 10:57:21 +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
|
96d066204d
|
add bold support for mac
|
2016-08-30 14:41:59 +08:00 |
|
zilongshanren
|
a6c7155922
|
fix label shrink crash issue
|
2016-08-29 11:12:01 +08:00 |
|
pandamicro
|
1dd701936b
|
Fix compilation issues on Mac
|
2016-08-11 13:57:51 +08:00 |
|
pandamicro
|
fe85f150d9
|
Upgrade cocos/platform to v3.13
|
2016-08-05 18:13:48 +08:00 |
|
zilongshanren
|
574df2bad3
|
improve iOS and Mac clamp and shrink feature
|
2016-06-13 15:19:34 +08:00 |
|
zilongshanren
|
c2e5a97f6a
|
add system font label overflow
|
2016-06-12 17:43:02 +08:00 |
|
Wenhai Lin
|
ec1a1d65b7
|
Remove unnecessary 'void' modifier
|
2016-04-07 23:13:19 +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 |
|