Merge commit 'c0ecce88cd8ecb7817b7283945e9f3e7315ccf5d'

Conflicts:
	www/corelib/classes/BlockClass.js
	www/corelib/classes/StageObjectClass.js

diff --cc www/corelib/classes/GameStageClass.js
index 5104f82,da9b0df..55a21c8
--- 1/www/corelib/classes/GameStageClass.js
--- 2/www/corelib/classes/GameStageClass.js
+++ b/www/corelib/classes/GameStageClass.js
@@@ -118,11 -117,14 +121,10 @@@ GameStage.prototype = 
                //\83X\83e\81[\83W\8f\89\8aú\89»\8f\88\97\9d
                this.tickCount = 0;
                //\8fÕ\93Ë\83}\83b\83v\8f\89\8aú\89»
 -              if(this.manager.enableStageDebug)
 -              {
 -                      this.collisionMapCanvas = createCanvas("collisionMapCanvas", this.mainCanvas.width, this.mainCanvas.height, this.mainCanvas.width, 0, 1, this.manager.mainArea);
 -                      this.collisionMapContext = this.collisionMapCanvas.getContext('2d');
 -                      this.collisionMapContext.fillStyle = "rgba(0,0,0, 0.2)";
 -                      this.collisionMapContext.strokeStyle = "rgba(0,0,0, 0.2)";
 -                      this.collisionMapContext.scale(1, 1);
 -              }
 +              this.collisionMapCanvas = createCanvas("collisionMapCanvas", this.mainCanvas.width, this.mainCanvas.height, this.mainCanvas.width, 0, 1, this.manager.mainArea);
 +              this.collisionMapContext = this.collisionMapCanvas.getContext('2d');
 +              this.collisionMapContext.fillStyle = "rgba(0,0,0, 0.2)";
 +              this.collisionMapContext.strokeStyle = "rgba(0,0,0, 0.2)";
-               this.collisionMapContext.scale(1, 1);
        },
        stopStage: function(){
                //\83X\83e\81[\83W\8fI\97¹\8f\88\97\9d

diff --cc www/corelib/classes/HorizonalScrollStageClass.js
index b32fba6,647a1d3..97e914d
--- 1/www/corelib/classes/HorizonalScrollStageClass.js
--- 2/www/corelib/classes/HorizonalScrollStageClass.js
+++ b/www/corelib/classes/HorizonalScrollStageClass.js
@@@ -46,8 -46,8 +46,7 @@@ var HorizonalScrollStageClass = functio
                        {
                                this.mainContext.drawImage(this.background, pos, 0, 640, 480);
                        }
--              }else
--              {
++              } else{
                        //\83L\83\83\83\93\83o\83X\82ð\91S\8fÁ\8b\8e
                        this.mainContext.clearRect(0, 0, this.mainCanvas.width, this.mainCanvas.height);
                }

diff --cc www/corelib/classes/OperatedCharacterClass.js
index 4132c5f,67dddd0..66325de
--- 1/www/corelib/classes/OperatedCharacterClass.js
--- 2/www/corelib/classes/OperatedCharacterClass.js
+++ b/www/corelib/classes/OperatedCharacterClass.js
@@@ -33,7 -34,7 +33,8 @@@ var OperatedCharacterClass = function(o
                this.movingSpeed.x += (this.movingVelocity - this.movingSpeed.x) / 3;
        },
        
 -      //\92Ê\8fí\83W\83\83\83\93\83v\82·\82é\82Æ\82«\82É\8cÄ\82Î\82ê\82é\81B\83W\83\83\83\93\83v\83L\81[\82ð\89\9f\82µ\82Ä\82¢\82é\8aÔ\82Í\82¸\82Á\82Æ\8cÄ\82Î\82ê\82é    //\82¸\82Á\82Æ\8cÄ\82Î\82ê\82é\95K\97v\82Í\82È\82¢\82Æ\8ev\82¤\81B\82Í\82Á\82«\82è\8c¾\82Á\82Ä\83o\83O\82©\82Æ\8ev\82¤\81B
 +      //\92Ê\8fí\83W\83\83\83\93\83v\82·\82é\82Æ\82«\82É\8cÄ\82Î\82ê\82é\81B\83W\83\83\83\93\83v\83L\81[\82ð\89\9f\82µ\82Ä\82¢\82é\8aÔ\82Í\82¸\82Á\82Æ\8cÄ\82Î\82ê\82é
++      //\83W\83\83\83\93\83v\83L\81[\82ð\89\9f\82µ\82Ä\82¢\82é\8e\9e\8aÔ\82Ì\92·\82³\82É\89\9e\82¶\82Ä\83W\83\83\83\93\83v\82Ì\8d\82\82³\82ª\95Ï\89»\82·\82é\81B
        jump : function(){
                if((this.collideFlag & 4) != 0)
                {
@@@ -50,6 -51,6 +51,8 @@@
                }
        },
        jumpEnd: function(){
++              //\83W\83\83\83\93\83v\83L\81[\82ª\89\9f\82³\82ê\82Ä\82¢\82È\82¢\8aÔ\82Í\82±\82¿\82ç\82ª\8cÄ\82Ñ\8fo\82³\82ê\82é\81B
++              //\83W\83\83\83\93\83v\83L\81[\82ð\82²\82­\92Z\8e\9e\8aÔ\89\9f\82µ\82½\8fê\8d\87\82Å\82à\81A\82 \82é\88ê\92è\82Ì\8d\82\82³\82Ü\82Å\82Í\83W\83\83\83\93\83v\82·\82é\82æ\82¤\82É\82·\82é\82½\82ß\81B
                if(this.jumpPower_tickCount < this.jumpPower_tickCountBase - this.jumpPower_tickCountAtLeast){
                        this.jumpPower_tickCount = 0;
                } else{

diff --cc www/corelib/core.js
index ab784ed,1dce9b3..91b992b
--- 1/www/corelib/core.js
--- 2/www/corelib/core.js
+++ b/www/corelib/core.js
@@@ -78,8 -81,11 +81,7 @@@ function GameManager(parent, debugTextN
        this.mainContext = this.mainCanvas.getContext('2d');
        this.debugText = document.getElementById(debugTextName);        //要素が存在しないとnullになり、デバッグが無効になる
        if(!this.debugText) this.debugText = null;
- 
        
 -      // ステージのデバッグ表示を有効にするか
 -      this.enableStageDebug = false;
 -
 -      
        //ブラウザチェック
        this.isIE = false;
        if(!this.isAvailableBrowser()){

diff --cc www/editor/index.html
Simple merge

diff --cc www/index_local_debug.html
Simple merge