Merge branch 'master' into fix-save-array

Author: liply

.gitignore

@@ -52,4 +52,6 @@ jspm_packages
 dist/
 *.iml
 game/**/*
-todo.md
+todo.md
+corescript/**/*
+corescript.zip

copy-all.js

@@ -0,0 +1,8 @@
+let cpx = require('cpx');
+let fs = require('fs');
+
+const root = process.argv[2] || './corescript';
+cpx.copySync('./template/**/*', root);
+cpx.copySync('./dist/*', root + '/js');
+cpx.copySync('./js/libs/*', root + '/js/libs');
+cpx.copySync('./plugins/*', root + '/js/plugins');

js/rpg_core/Bitmap.js

@@ -855,7 +855,7 @@ Bitmap.prototype._requestImage = function(url){
 
     if(!Decrypter.checkImgIgnore(url) && Decrypter.hasEncryptedImages) {
         this._loadingState = 'decrypting';
-        Decrypter.decryptImg(url, bitmap);
+        Decrypter.decryptImg(url, this);
     } else {
         this._image.src = url;
         this._image.onload = Bitmap.prototype._onLoad.bind(this);

js/rpg_core/ShaderTilemap.js

@@ -15,7 +15,7 @@ ShaderTilemap.prototype.constructor = ShaderTilemap;
 
 // we need this constant for some platforms (Samsung S4, S5, Tab4, HTC One H8)
 PIXI.glCore.VertexArrayObject.FORCE_NATIVE = true;
-PIXI.GC_MODES.DEFAULT = PIXI.GC_MODES.AUTO;
+PIXI.settings.GC_MODE = PIXI.GC_MODES.AUTO;
 PIXI.tilemap.TileRenderer.SCALE_MODE = PIXI.SCALE_MODES.NEAREST;
 
 /**

js/rpg_core/Sprite.js

@@ -57,17 +57,15 @@ Object.defineProperty(Sprite.prototype, 'bitmap', {
     },
     set: function(value) {
         if (this._bitmap !== value) {
-            if(!this._bitmap){
+            this._bitmap = value;
+
+            if(value){
                 this._refreshFrame = true;
-            }else if(this._bitmap && value){
-                this._refreshFrame = false;
-            }else if(!value){
+                value.addLoadListener(this._onBitmapLoad.bind(this));
+            }else{
                 this._refreshFrame = false;
                 this.texture.frame = Rectangle.emptyRectangle;
             }
-
-            this._bitmap = value;
-            if(value)value.addLoadListener(this._onBitmapLoad.bind(this));
         }
     },
     configurable: true
@@ -158,6 +156,7 @@ Sprite.prototype.move = function(x, y) {
  * @param {Number} height The height of the frame
  */
 Sprite.prototype.setFrame = function(x, y, width, height) {
+    this._refreshFrame = false;
     var frame = this._frame;
     if (x !== frame.x || y !== frame.y ||
             width !== frame.width || height !== frame.height) {

js/rpg_core/Utils.js

@@ -28,7 +28,7 @@ Utils.RPGMAKER_NAME = 'MV';
  */
 Utils.RPGMAKER_VERSION = "1.3.5";
 
-Utils.RPGMAKER_ENGINE = "community-1.1";
+Utils.RPGMAKER_ENGINE = "community-1.1b";
 
 /**
  * Checks whether the option is in the query string.

js/rpg_core/_header.js

@@ -1,3 +1,3 @@
 //=============================================================================
-// rpg_core.js v1.3.5
+// rpg_core.js v1.3.5 (community-1.1b)
 //=============================================================================

js/rpg_managers/_header.js

@@ -1,3 +1,3 @@
 //=============================================================================
-// rpg_managers.js v1.3.5
+// rpg_managers.js v1.3.5 (community-1.1b)
 //=============================================================================

js/rpg_objects/_header.js

@@ -1,3 +1,3 @@
 //=============================================================================
-// rpg_objects.js v1.3.5
+// rpg_objects.js v1.3.5 (community-1.1b)
 //=============================================================================

js/rpg_scenes/_header.js

@@ -1,3 +1,3 @@
 //=============================================================================
-// rpg_scenes.js v1.3.5
+// rpg_scenes.js v1.3.5 (community-1.1b)
 //=============================================================================