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

Fix compilation issues and update web & bindings-generator

This commit is contained in:
pandamicro 2016-12-13 15:37:46 +08:00
parent 603386d96e
commit d89bde4e8e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/js-bindings/script/jsb_boot.js
View File

@ -775,6 +775,8 @@ cc.formatStr = function(){
// Define singleton objects // Define singleton objects
cc.director = cc.Director.getInstance(); cc.director = cc.Director.getInstance();
cc.director._actionManager = cc.director.getActionManager();
cc.director._scheduler = cc.director.getScheduler();
cc.winSize = cc.director.getWinSize(); cc.winSize = cc.director.getWinSize();
cc.view = cc.director.getOpenGLView(); cc.view = cc.director.getOpenGLView();
@ -1548,7 +1550,7 @@ cc._initDebugSetting = function (mode) {
cc.log = cc.warn = cc.error = cc.assert = function () {}; cc.log = cc.warn = cc.error = cc.assert = function () {};
if (mode > ccGame.DEBUG_MODE_NONE) { if (mode > ccGame.DEBUG_MODE_NONE) {
console.log = function () { console.log = function () {
bakLog(cc.js.formatStr.apply(null, arguments)); bakLog(cc.formatStr.apply(null, arguments));
}; };
console.error = function () { console.error = function () {
bakLog("ERROR : " + cc.formatStr.apply(cc, arguments)); bakLog("ERROR : " + cc.formatStr.apply(cc, arguments));

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 32404751d5399ccb0cd9df4b72b211506cade321 Subproject commit fc5c0a5643ddbc9e5785079010b0c265c1be3ee6

2
web

@ -1 +1 @@
Subproject commit 8aabcdabcb92f7d4736cc1d8adbf6105cd72a0f9 Subproject commit 640431814638f732a4b886182820cc8a88a75e87