Update versions and html5 engine

fumingxing2015 · Sep 21, 2015 · d3504a9 · d3504a9
1 parent b54a06a
commit d3504a9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 project (Cocos2d-X)
 
 # The version number
-set(COCOS2D_X_VERSION 3.8)
+set(COCOS2D_X_VERSION 3.9)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
 include(CocosBuildHelpers)

diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp
@@ -31,7 +31,7 @@ NS_CC_BEGIN
 
 CC_DLL const char* cocos2dVersion()
 {
-    return "cocos2d-x-3.8";
+    return "cocos2d-x-3.9";
 }
 
 NS_CC_END

diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h
@@ -39,7 +39,7 @@
 #include <assert.h>
 #include <memory>
 
-#define ENGINE_VERSION "Cocos2d-JS v3.8"
+#define ENGINE_VERSION "Cocos2d-JS v3.9 Beta"
 
 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
@@ -26,7 +26,7 @@
 
 // CCConfig.js
 //
-cc.ENGINE_VERSION = "Cocos2d-JS v3.8";
+cc.ENGINE_VERSION = "Cocos2d-JS v3.9 Beta";
 
 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
@@ -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.8
+PROJECT_NUMBER         = v3.9
 
 # 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
@@ -41,7 +41,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.8</string>
+	<string>3.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/tools/simulator/frameworks/runtime-src/proj.win32/game.rc b/tools/simulator/frameworks/runtime-src/proj.win32/game.rc
@@ -64,7 +64,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "About Simulator"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CTEXT           "Version 3.8 (20150227)",IDC_ABOUT_VERSION,35,70,173,17
+    CTEXT           "Version 3.9 (20150922)",IDC_ABOUT_VERSION,35,70,173,17
     CTEXT           "Cocos Simulator",IDC_ABOUT_TITLE,35,49,173,17
     CTEXT           "Copyright (C) 2015. All rights reserved.",IDC_STATIC,35,94,173,17
     ICON            "GLFW_ICON",IDC_STATIC,111,15,20,20

diff --git a/web b/web
+0 −22		cocos2d/core/CCDirector.js
+17 −0		cocos2d/core/CCDirectorWebGL.js
+92 −90		cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
+2 −129		cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js
+1 −1		cocos2d/core/platform/CCConfig.js
+10 −2		cocos2d/core/platform/CCLoaders.js
+9 −7		cocos2d/core/renderer/RendererCanvas.js
+10 −0		cocos2d/core/scenes/CCLoaderScene.js
+8 −1		cocos2d/core/utils/CCProfiler.js
+1 −1		cocos2d/tilemap/CCTMXXMLParser.js
+352 −296		extensions/ccui/base-classes/UIScale9Sprite.js
+45 −13		extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js
+48 −1		extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js
+1 −1		extensions/cocostudio/timeline/ActionTimeline.js
+3 −3		extensions/editbox/CCEditBox.js
+0 −1,095		extensions/gui/control-extension/CCScale9Sprite.js
+0 −144		extensions/gui/control-extension/CCScale9SpriteCanvasRenderCmd.js
+0 −129		extensions/gui/control-extension/CCScale9SpriteWebGLRenderCmd.js
+3 −1		extensions/gui/scrollview/CCScrollViewCanvasRenderCmd.js
+1 −0		extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js
+0 −3		moduleConfig.json
+4 −10		tools/build.xml
+209 −18		tools/template/build.xml