From a2a32ef58cfe7feb3ea12de95b76bad3411d2d64 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 25 Jul 2015 15:16:39 +0800 Subject: [PATCH] Release docs for v3.7.1 --- .travis.yml | 1 - AUTHORS | 2 ++ CHANGELOG | 24 +++++++++++++++++++ CMakeLists.txt | 2 +- cocos/cocos2d.cpp | 2 +- .../js-bindings/manual/ScriptingCore.h | 2 +- .../js-bindings/script/jsb_cocos2d.js | 2 +- docs/doxygen.config | 2 +- .../runtime-src/proj.ios_mac/mac/Info.plist | 2 +- web | 2 +- 10 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 539d4be9e9cb..d274719b2c13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,3 @@ before_install: branches: only: - v3.7.1 - - v3 diff --git a/AUTHORS b/AUTHORS index 48c64d9af2d2..352ee72ee76d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,6 +22,7 @@ Framework & Tools Developers: Web Developers: Sijie Wang (VisualSJ) + Menghe Zhang (ZhangMenghe) 3D Developers: Xiao Yang (super626) @@ -135,6 +136,7 @@ Developers: Added Dutch Language support. Added clang support for Windows. Cmake update and remove old scripts from build folder + Fixed building with system prebuilt libs on Linux mchinen fix emulator issue for OpenGL ES 2.0 on Android diff --git a/CHANGELOG b/CHANGELOG index d5c020b8a03f..27ae37284c4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,30 @@ cocos2d-x-3.8 ?? [FIX] renderer: UI component can't click correctly by moving UI and camera far away of origin. [FIX] JS: Fixed issue of iOS/JS reflection `callStaticMethod` with bool arg +cocos2d-x-3.7.1 ?? + [HIGHLIGHT] studio: Added new skeleton animation support and csb parser for cocos v2.3.2 beta + [HIGHLIGHT] studio: Added new skeleton animation support and JSON parser in the web engine + [HIGHLIGHT] studio: Added Skybox csb/JSON parser for cocos v2.3.2 beta + + [NEW] Node: Added getNodeToParentTransform with selected ancestor + [NEW] studio: Parsed Touch/Click/Event callback in JSON parser + [NEW] web: Added cc.director.setClearColor and support transparent background + [NEW] web: Added Animate's getCurrentFrameIndex function + + [REFINE] studio: Optimized JSON parser's performance by removing audio play + [REFINE] studio: Optimized editor related extension data to a component instead of hosting in _userObject + [REFINE] studio: Updated Game3DNodeReader & UserCameraReader + [REFINE] web: Improved color/opacity manipulations in MenuItems + + [FIX] Scene: Fixed Scene can't be inherited with std::vector members + [FIX] Label: Fixed creation fail if the font(TTF) contains a non-unicode charmap + [FIX] platform: Fixed building with system prebuilt libs on Linux + [FIX] studio: Fixed ccs.Skin construction issue in JSON parser + [FIX] web: Fixed an issue that loading process won't trigger callback problem + [FIX] web: Fixed a bug where not resetting cc.Audio._ignoreEnded when replaying a sound caused it to stay in a "playing" state + [FIX] web: cc.ScrollView and cc.TableView: added check for parent visibility in onTouchBegan method + [FIX] web: Fixed TurnPageDown effect + cocos2d-x-3.7final July.21 2015 [REFINE] JS: Improve manual binding code for `retain`, `release`, `onEnter`, `onExit`, `onEnterTransitionDidFinish` and `onExitTransitionDidStart` [REFINE] web: Add compatible Uint16Array defintion diff --git a/CMakeLists.txt b/CMakeLists.txt index 98e96619c1ef..7ef8ee05caac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() project (Cocos2d-X) # The version number -set(COCOS2D_X_VERSION 3.7) +set(COCOS2D_X_VERSION 3.7.1) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/") include(CocosBuildHelpers) diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index 7ddafddb44f4..f6491a677b0e 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -31,7 +31,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "cocos2d-x-3.7"; + return "cocos2d-x-3.7.1"; } NS_CC_END diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h index ddcf8a70ccd1..04d67003f0ae 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.h +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.h @@ -39,7 +39,7 @@ #include #include -#define ENGINE_VERSION "Cocos2d-JS v3.7" +#define ENGINE_VERSION "Cocos2d-JS v3.7.1" void js_log(const char *format, ...); diff --git a/cocos/scripting/js-bindings/script/jsb_cocos2d.js b/cocos/scripting/js-bindings/script/jsb_cocos2d.js index 628d60a9e0e5..175b246627a6 100644 --- a/cocos/scripting/js-bindings/script/jsb_cocos2d.js +++ b/cocos/scripting/js-bindings/script/jsb_cocos2d.js @@ -26,7 +26,7 @@ // CCConfig.js // -cc.ENGINE_VERSION = "Cocos2d-JS v3.7"; +cc.ENGINE_VERSION = "Cocos2d-JS v3.7.1"; cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0; cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0}; diff --git a/docs/doxygen.config b/docs/doxygen.config index 9ec98c87d17d..af7ce33c40b1 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -38,7 +38,7 @@ PROJECT_NAME = Cocos2d-x # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v3.7 +PROJECT_NUMBER = v3.7.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist b/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist index b4d91ddeaab7..676632476908 100644 --- a/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist +++ b/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist @@ -41,7 +41,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.7 + 3.7.1 CFBundleSignature ???? CFBundleVersion diff --git a/web b/web index 2edac92e3547..1d9ec84d9d27 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 2edac92e3547770f1252d34f3783dd44aca4c71f +Subproject commit 1d9ec84d9d273273fe593546b09e3efc85860e45