肖峰
|
728682d68e
|
Fix variable type mismatch.
|
2015-12-25 17:18:15 +08:00 |
肖峰
|
dea99211fb
|
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
|
2015-12-25 11:44:11 +08:00 |
Filipe Lemos
|
61ce3e8a03
|
Fixed warnings about missing override in CCApplication for iOS/Mac
|
2015-10-30 10:02:07 +00:00 |
Filipe Lemos
|
9aa1f7138d
|
Added override keyword to getVersion
|
2015-10-29 08:36:03 +00:00 |
Filipe Lemos
|
04fa7a8902
|
Added Application::getVersion() to get the app version.
|
2015-10-28 17:57:57 +00: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 |
Martin Taylor
|
62e36e8006
|
fix typos and syntax error. A thorough check by tool VSSpellChecker.
|
2015-09-22 16:08:23 +08: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 |
Jacky
|
4499b60446
|
Refine setAnimationInterval from double to float.
|
2015-07-06 14:57:42 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
Daiki Asahi
|
fc92acf587
|
remove interlevel argument.
|
2015-04-03 16:43:39 +09:00 |
lyubomirv
|
2aec39ad56
|
Added Bulgarian language.
|
2015-03-17 15:14:02 +02:00 |
loadrunner
|
9e310ba272
|
added Romanian language
|
2015-02-25 17:25:19 +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 |
Mykyta Usikov
|
d9b5ab4a4c
|
added Turkish and Ukrainian language;
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
|
2014-12-25 12:08:23 +02: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 |
huangshiwu
|
4dd9120e67
|
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
|
2014-10-11 15:19:20 +08:00 |
minggo
|
2620592d62
|
Merge pull request #7975 from newnon/v3_openUrl
openUrl function for all platform but on windows RT empty function
|
2014-09-25 13:41:08 +08:00 |
Sergey Perepelitsa
|
d8216149de
|
precompiled headers improvements for iOS & Mac
|
2014-09-23 23:19:25 +04:00 |
Sergey
|
2255cf91ba
|
openUrl function for all platform but on windows RT empty function
|
2014-09-22 17:47:38 +04:00 |
Ricardo Quesada
|
525fecc4ce
|
even more cmake fixes
|
2014-09-11 17:36:49 -07: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 |
Ricardo Quesada
|
c149bfca00
|
Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
|
2014-08-29 12:54:24 -07:00 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
huangshiwu
|
7dec715288
|
OpenGL context attributions setting revise
|
2014-08-22 10:55:39 +08:00 |
huangshiwu
|
2369a5900d
|
merge v3 to v3_glviewattrs
|
2014-08-21 10:18:55 +08:00 |
huangshiwu
|
2a03bea1a4
|
OpenGL context attributions setting
|
2014-08-21 09:35:32 +08:00 |
Sergey
|
bfe6513706
|
setKeepScreenOn method
|
2014-08-19 15:00:58 +04:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
minggo
|
20e3a61524
|
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
mac custom font fix v2
|
2014-07-25 11:38:38 +08:00 |
minggo
|
98943b4517
|
Merge pull request #7548 from yongkangchen/v3
fix Label::setTextColor did not have any effect.
|
2014-07-25 11:18:10 +08:00 |
Sergey
|
9501b9912d
|
load font v2
|
2014-07-24 12:25:07 +04:00 |
Yongkang Chen
|
bb7d6ba3d4
|
fix Label::setTextColor did not have any effect.
|
2014-07-22 14:52:41 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
Huabing.Xu
|
0be2210724
|
rename CGSize to NSSize
|
2014-07-18 16:51:29 +08:00 |
Huabing.Xu
|
21b3e55339
|
Mac dylib version works now
|
2014-07-17 20:58:50 +08:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |