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
..
android	Label:support font that contains GB2312 char map.	2015-07-28 16:28:32 +08:00
apple	fix tons of warnings	2015-07-15 12:04:48 +08:00
desktop	Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug	2015-07-31 18:43:23 +08:00
ios	Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios	2015-07-29 11:09:56 +08:00
linux	Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.	2015-07-13 17:06:01 +08:00
mac	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
win8.1-universal	don't delete rendering thread. SpiderMonkey needs to stay on same thread	2015-06-03 09:19:05 -07:00
win32	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
winrt	Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.	2015-07-13 17:06:01 +08:00
CCApplication.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCApplicationProtocol.h	Refine setAnimationInterval from double to float.	2015-07-06 14:57:42 +08:00
CCCommon.h	[ci skip]Update comments	2015-03-24 20:29:13 +08:00
CCDevice.h	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02:00
CCFileUtils.cpp	Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.	2015-07-13 22:44:40 +08:00
CCFileUtils.h	Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.	2015-07-13 17:06:01 +08:00
CCGL.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCGLView.cpp	move viewport to experimental namespace	2015-06-09 16:21:50 +08:00
CCGLView.h	issue #12078: added platform group	2015-05-28 15:47:40 +08:00
CCImage.cpp	remove EMSCRIPTEN related code	2015-07-16 14:15:41 +08:00
CCImage.h	rename -win to -winrt	2015-04-21 18:17:18 -07:00
CCPlatformConfig.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCPlatformDefine.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCPlatformMacros.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCSAXParser.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCSAXParser.h	[ci skip]Update comments	2015-03-24 20:23:51 +08:00
CCStdC.h	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
CCThread.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCThread.h	[ci skip]Update comments	2015-03-24 20:23:51 +08:00
CMakeLists.txt	Add the PolySprite support and adjust the project setting on the different platform	2015-04-23 00:51:47 +08:00