Merge pull request cocos2d#12850 from pandamicro/v3.7-release

[ci skip] v3.7 rc1 release doc

CHANGELOG

@@ -4,6 +4,35 @@ 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.7rc1  July.14 2015
+    [REFINE]        framework: Used msbuild to generating engine prebuilt libs on win32.
+    [REFINE]        3d: Used shader with normal while creating mesh with normals
+    [REFINE]        3d: Set default 3d animation quality to low
+    [REFINE]        web: Improved localStorage warning when disabled
+
+    [FIX]           studio: Fixed percentage setting won't take effect when UISlider's background resource set to null
+    [FIX]           studio: Fixed a bug that SingleNode's color isn't set
+    [FIX]           studio: Fixed child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk
+    [FIX]           studio: Fixed a bug of JSON parser that texture address is wrong
+    [FIX]           studio: Fixed a bug that drawLine & drawPoints don't apply blend function in parser
+    [FIX]           studio: Fixed a bug that check box front cross texture will expand to normal size when change status between normal and disable frequently
+    [FIX]           studio: Fixed a bug that normal texture won't show when slider set to disable mode then clean slider ball disable texture
+    [FIX]           3d: Fixed obj loading failed on windows
+    [FIX]           3d: Fixed clipping node does not work for Sprite3D
+    [FIX]           platform: Fixed js template run error on linux
+    [FIX]           Tilemap: Fixed CCTMXXMLParser code negligence
+    [FIX]           JS: Fixed constant value error for ccui.Layout.BACKGROUND_IMAGE_ZORDER
+    [FIX]           JS: Fixed XMLHttpRequest can't be retain in JSB
+    [FIX]           JS: Added cc.path.mainFileName
+    [FIX]           JS: Fixed issue that override cleanup function in JS can't get invoked during node detaching
+    [FIX]           JS: Fixed cc.loader notification issue with image asynchonous loading
+    [FIX]           web: Fixed MenuItems' color/opacity setter issue with child nodes
+    [FIX]           web: Fixed page view's layout issue for JSON parser
+    [FIX]           web: Add ttc loader and prevent the pure digital fonts is invalid
+    [FIX]           web: Fixed Float32Array initialization
+    [FIX]           web: Fixed a bug that layout background is missing
+    [FIX]           web: Fixed a bug that ObjectExtensionData miss setCustomProperty and getCustomProperty function
+
 cocos2d-x-3.7rc0  July.1 2015
     [HIGHLIGHT]     core: Added Material system (JS/Lua ready)
     [HIGHLIGHT]     3d: Added Physics3d support (JS/Lua ready)

cocos/cocos2d.cpp

@@ -31,7 +31,7 @@ NS_CC_BEGIN
 
 CC_DLL const char* cocos2dVersion()
 {
-    return "cocos2d-x-3.7rc0";
+    return "cocos2d-x-3.7rc1";
 }
 
 NS_CC_END

cocos/scripting/js-bindings/manual/ScriptingCore.h

@@ -39,7 +39,7 @@
 #include <assert.h>
 #include <memory>
 
-#define ENGINE_VERSION "Cocos2d-JS v3.7 RC0"
+#define ENGINE_VERSION "Cocos2d-JS v3.7 RC1"
 
 void js_log(const char *format, ...);
 

cocos/scripting/js-bindings/script/jsb_cocos2d.js

@@ -26,7 +26,7 @@
 
 // CCConfig.js
 //
-cc.ENGINE_VERSION = "Cocos2d-JS v3.7 RC0";
+cc.ENGINE_VERSION = "Cocos2d-JS v3.7 RC1";
 
 cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
 cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};

docs/RELEASE_NOTES.md

@@ -2,7 +2,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Cocos2d-x v3.7 RC0 Release Notes](#cocos2d-x-v37-rc0-release-notes)
+- [Cocos2d-x v3.7 RC1 Release Notes](#cocos2d-x-v37-rc0-release-notes)
 - [Misc Information](#misc-information)
 - [Requirements](#requirements)
   - [Runtime Requirements](#runtime-requirements)
@@ -32,7 +32,7 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# Cocos2d-x v3.7 RC0 Release Notes #
+# Cocos2d-x v3.7 RC1 Release Notes #
 
 # Misc Information
 
@@ -169,11 +169,11 @@ cocos new -l cpp|js|lua MyGame
 * JS: Merged JSB and web engine into Cocos2d-x for a All-in-one engine
 * JS: Added `ccui.VideoPlayer` and `ccui.WebView` for iOS/Android/Web
 * console: Supported build & run Android Studio project with cocos console
-* sdkbox: super EASY way to integrate 3rd party SDKs into cocos2d-x
+* SDKBOX: super EASY way to integrate 3rd party SDKs into cocos2d-x
 
 ## Download
 
-[Cocos2d-x v3.7 RC0](http://www.cocos2d-x.org/filedown/cocos2d-x-3.7rc0.zip) including : C++, Lua & JS
+[Cocos2d-x v3.7 RC1](http://www.cocos2d-x.org/filedown/cocos2d-x-3.7rc1.zip) including : C++, Lua & JS
 
 ## The main features in detail:
 
@@ -237,11 +237,14 @@ Samsung have provided a series of Enhanced API to optimize Cocos2d-x games for S
 In the previous versions, the resources file name's case is ignored on win32 platform, but not ignored in other platforms. This will lead to some unexpected issues, especially when user develop with win32 platform and pulish to other platforms like Android. In win32, the file name may be found without matching the case, but on other platforms it won't be found. So we decided to make win32 platform's resources case sensitive. Please make sure you are using the correct file name for your resources.
 
 ### SDKBOX
+
 SDKBOX is a project that's built by part of the cocos2d-x team, in order to makes integrating 3rd party SDKs super EASY.
 With SDKBOX you can integrate services like In App Purchase with one command
+
 ```
 sdkbox import -b iap
 ```
+
 Currently supported service including
 
 * [Tune](http://cocos2d-x.org/sdkbox/tune)
@@ -253,9 +256,6 @@ Currently supported service including
 * [Google Analytics](http://cocos2d-x.org/sdkbox/googleanalytics)
 * [Flurry Analytics](http://cocos2d-x.org/sdkbox/flurryanalytics)
 
-
-
-
 ## The Next Step
 
 As you can see, in v3.7, we have enhanced our 2d rendering with material system and integrated polygon sprite. More importantly, our 3d features become more and more complete, 3d Physics and Navigation Mesh with the previous Camera, 3d Sprite, 3d Particle System, 3d Light, 3d Terrain, Skybox, now you can really start to use Cocos to make a 3d game.