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

Update engine version

This commit is contained in:
pandamicro 2016-12-19 12:15:41 +08:00
parent 51a09048bd
commit 149bdf125e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@
#include <memory> #include <memory>
#include <chrono> #include <chrono>
#define ENGINE_VERSION "Cocos2d-JS v3.13" #define ENGINE_VERSION "Cocos2d-JS v3.14"
void js_log(const char *format, ...); void js_log(const char *format, ...);

4
cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js
View File

@ -38,7 +38,7 @@ ccui.Widget.prototype._ctor
= ccui.ScrollView.prototype._ctor = ccui.ScrollView.prototype._ctor
= function(){ = function(){
this.init(); this.init();
} };
ccui.Button.prototype._ctor = function (normalImage, selectedImage, disableImage, texType) { ccui.Button.prototype._ctor = function (normalImage, selectedImage, disableImage, texType) {
if(texType !== undefined) if(texType !== undefined)
@ -80,7 +80,7 @@ ccui.ImageView.prototype._ctor = function(imageFileName, texType){
} }
else else
ccui.Widget.prototype.init.call(this); ccui.Widget.prototype.init.call(this);
} };
ccui.LoadingBar.prototype._ctor = function(textureName, percentage){ ccui.LoadingBar.prototype._ctor = function(textureName, percentage){
ccui.Widget.prototype.init.call(this); ccui.Widget.prototype.init.call(this);

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.13"; cc.ENGINE_VERSION = "Cocos2d-JS v3.14";
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
web

@ -1 +1 @@
Subproject commit 640431814638f732a4b886182820cc8a88a75e87 Subproject commit 544c0159efc414879105688966de6599b1ad23c4