肖峰
|
dea99211fb
|
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
|
2015-12-25 11:44:11 +08:00 |
|
WenhaiLin
|
7b758fd780
|
Fixed text may display of incomplete when Label create with system font on Mac.
|
2015-10-28 12:06:58 +08:00 |
|
mogemimi
|
5993304e06
|
Fix typos
|
2015-10-09 17:59:11 +09:00 |
|
WenhaiLin
|
a0c270234b
|
Replace tab with spaces
|
2015-08-14 21:17:51 +08:00 |
|
pandamicro
|
d20052cc22
|
Fix line wrapper in CCDevice
|
2015-08-04 11:07:04 +08:00 |
|
Sridher Jakku
|
f48a9fb9f0
|
getDPI for Mac Implemented
|
2015-08-03 17:12:52 +05:30 |
|
pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
|
WenhaiLin
|
20d445ad1a
|
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
|
2015-07-29 16:11:27 +08:00 |
|
andyque
|
6de387b3ac
|
fix Mac system font crash issue
|
2015-07-29 15:20:31 +08:00 |
|
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
|
WenhaiLin
|
415bbeba21
|
Fixed the alpha channel of text color of system font not take effect
|
2015-01-20 16:04:14 +08:00 |
|
WenhaiLin
|
f2c6a48976
|
Fixed lose the precision of label's dimensions
|
2015-01-20 11:46:43 +08:00 |
|
Wenhai Lin
|
ed86f65270
|
Fixed label may show nothing when using system font on Mac
|
2014-12-03 17:07:51 +08:00 |
|
Dhilan007
|
90b2d8464b
|
Fixed line wrap error for system font on MAC
|
2014-10-21 16:46:00 +08:00 |
|
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
|
Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |