Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14663 from xiaofeng11/v3.10 

Update all version number to v3.10
This commit is contained in:
pandamicro 2015-12-15 10:48:51 +08:00
parent 77ca89a0fa 4815ec8b9a
commit 280a8e9d9c
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
cocos/cocos2d.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
// 0x00 HI ME LO // 0x00 HI ME LO
// 00 03 08 00 // 00 03 08 00
#define COCOS2D_VERSION 0x00030900 #define COCOS2D_VERSION 0x00031000
// //
// all cocos2d include files // all cocos2d include files

2
cocos/scripting/js-bindings/manual/ScriptingCore.h
View File

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

2
cocos/scripting/js-bindings/script/jsb_cocos2d.js
View File

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

2
docs/doxygen.config
View File

@ -38,7 +38,7 @@ PROJECT_NAME = Cocos2d-x
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = v3.9 PROJECT_NUMBER = v3.10
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
View File

@ -41,7 +41,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.9</string> <string>3.10</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

4
tools/simulator/frameworks/runtime-src/proj.win32/game.rc
View File

@ -64,7 +64,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "About Simulator" CAPTION "About Simulator"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
CTEXT "Version 3.9 (20151106)",IDC_ABOUT_VERSION,35,70,173,17 CTEXT "Version 3.10 (20151222)",IDC_ABOUT_VERSION,35,70,173,17
CTEXT "Cocos Simulator",IDC_ABOUT_TITLE,35,49,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 CTEXT "Copyright (C) 2015. All rights reserved.",IDC_STATIC,35,94,173,17
ICON "GLFW_ICON",IDC_STATIC,111,15,20,20 ICON "GLFW_ICON",IDC_STATIC,111,15,20,20
@ -167,7 +167,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904B0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "game Module" VALUE "FileDescription", "game Module"
VALUE "FileVersion", "1, 0, 0, 1" VALUE "FileVersion", "1, 0, 0, 1"

2
web

@ -1 +1 @@
Subproject commit 116c3c9ac13354cd62e65dc4ef48738fa9872340 Subproject commit 5ff018e81bad24816373362146f2589e17706dfa