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

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

[ci skip]Update engine version
This commit is contained in:
pandamicro 2015-06-29 18:22:02 +08:00
parent a6ef03d580 15c763d84a
commit 53fb76ecfe
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/cocos2d.cpp
View File

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

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

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

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

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

2
web

@ -1 +1 @@
Subproject commit fec945a7000ff31a7c206ca2ca7fd13707a2570a
Subproject commit d70597b176ab4c11bf2dcbd1d18017436689dc85