Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb

Conflicts:
	build/cocos2d-wp8.sln

AUTHORS

@@ -369,6 +369,7 @@ Developers:
     giginet
         Fix CCRepeat#create is recieved bad argument on Lua binding.
         Added a feature that CCSSceneReader can load name properties as node names.
+        Added Rect::intersectsCircle().
 
     neokim
         Adds 'setFont' and 'setAnchorPoint' to CCEditBox.
@@ -1093,6 +1094,12 @@ Developers:
 
     Almax27
         RenderQueue command buffer optimize.
+
+    IgorMats
+        Added MotionStreak::getStroke/setStroke
+
+    matsuokah
+        Fixed the bug that JNI illegal start byte error causes crashing error on Android 5.0
 
 Retired Core Developers:
     WenSheng Yang

CHANGELOG

@@ -1,8 +1,25 @@
+cocos2d-x-3.6  ??
+    [NEW]           3rd: update chipmunk to v 6.2.2 on Windows 8.1 Universal App
+    [NEW]           3rd: update freetype to v 2.5.5 on Windows 8.1 Universal App
+    [NEW]           WP8: remove WP8 support because Angle don't support WP8 any more
+
+    [FIX]           JNI: JNI illegal start byte error which causes crashing error on Android 5.0
+
 cocos2d-x-3.6beta0 Apr.14 2015
+    [NEW]           3rd: update Spine runtime to v2.1.25
+    [NEW]           MotionStreak: add `MotionStreak::getStroke()` and `MotionStreak::setStroke()`
+    [NEW]           Rect: added `Rect::intersectsCircle()`
     [NEW]           UI:Text: add `Text::disableEffect(LabelEffect)` to disable a specific effect
 
+    [FIX]           3rd: link error on VS2012 caused by libpng
+    [FIX]           Label: position is wrong if it is visited by a new camera
+    [FIX]           Particle3D: crash on clone
+    [FIX]           Particle3D: "make local" now working correctly. "Make local" is a properties that toggles particle coordination between local and global.
+    [FIX]           Particle3D: particle rotation now no longer stacks up on each other
+    [FIX]           Particle3D: Ribbon Trail now positions correctly
     [FIX]           Physics: rigid body's rotation is wrong if it is attatched to a node which rotation is not 0
     [FIX]           Renderer: RenderQueue command buffer optimizing
+    [FIX]           UI:Button: use too much memory
     [FIX]           UI:Text: content size is wrong after setting outline effect
 
 cocos2d-x-3.6alpha0 Apr.8 2015

CMakeLists.txt

@@ -38,7 +38,7 @@ endif()
 project (Cocos2d-X)
 
 # The version number
-set(COCOS2D_X_VERSION 3.6alpha0)
+set(COCOS2D_X_VERSION 3.6beta0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
 include(CocosBuildHelpers)

README.md

@@ -89,11 +89,15 @@ Run
 
 ### Build and run new project for Windows 8.1 and Windows Phone 8.1 ###
 
-    $ cocos new MyGame -p com.bar.foo -l cpp -d projects
+    $ cocos new MyGame -p com.your_company.mygame -l cpp -d projects
 
-With the Cocos2d-x v3.3, you can create Universal App (Two projects at the same time: Windows(Tablet) and Windows Phone 8.1 )
+Visual Studio 2013 Update 4 or later is required.
+
+Starting with Cocos2d-x v3.3, you can create Windows 8.1 Universal Apps (Windows Store and Windows Phone 8.1)
 See more info on How to install and Create games on Windows RT (Windows and Windows Phone 8.1) at http://msopentech.github.io/cocos2d-x/
 
+Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8.0
+
 Main features
 -------------
    * Scene management (workflow)
@@ -184,6 +188,10 @@ $ bin/lua-empty-test/lua-empty-test
 
 Open the `cocos2d-x/build/cocos2d-win32.vc2012.sln`
 
+* For Windows 8.1 Universal Apps (Phone and Store)
+
+Open the `cocos2d-x/build/cocos2d-win8.1-universal.sln`
+
 * For Android
 
 ```