Merge https://github.com/cocos2d/cocos2d-html5 into webgl20

linshun · linshun · commit 1e9be15e352e · 2013-01-28T18:05:00.000+08:00
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js b/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
@@ -477,8 +477,10 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
                 }
             }
         }
-        // console.log(this._maxGID , this._tileSet.firstGid , this._minGID , this._tileSet.firstGid)
-        cc.Assert((this._maxGID >= this._tileSet.firstGid && this._minGID >= this._tileSet.firstGid), "TMX: Only 1 tileset per layer is supported");
+        
+        if(!((this._maxGID >= this._tileSet.firstGid) && (this._minGID >= this._tileSet.firstGid))){
+            cc.log("cocos2d:TMX: Only 1 tileset per layer is supported");
+        }
     },
 
     /**
diff --git a/samples b/samples
@@ -1 +1 @@
-Subproject commit 64bc4b19784fd1415942a3f7e922a6c4985d68ce
+Subproject commit 06bcf0aafbf979ca824e1ff9ccff3666b5aa903c

Original file line number	Diff line number	Diff line change
`@@ -477,8 +477,10 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`	`}`
`480`		`- // console.log(this._maxGID , this._tileSet.firstGid , this._minGID , this._tileSet.firstGid)`
`481`		`- cc.Assert((this._maxGID >= this._tileSet.firstGid && this._minGID >= this._tileSet.firstGid), "TMX: Only 1 tileset per layer is supported");`
	`480`	`+`
	`481`	`+ if(!((this._maxGID >= this._tileSet.firstGid) && (this._minGID >= this._tileSet.firstGid))){`
	`482`	`+ cc.log("cocos2d:TMX: Only 1 tileset per layer is supported");`
	`483`	`+ }`
`482`	`484`	`},`
`483`	`485`
`484`	`486`	`/**`