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 |
|