Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2698_namespace

dingpinglv · dingpinglv · commit e095e906dd3e · 2015-03-09T12:00:09.000+08:00
diff --git a/CCBoot.js b/CCBoot.js
@@ -1560,6 +1560,8 @@ cc._initSys = function (config, CONFIG_KEY) {
             browserType = sys.BROWSER_TYPE_ANDROID;
         else if (browserType == "trident") browserType = sys.BROWSER_TYPE_IE;
         else if (browserType == "360 aphone") browserType = sys.BROWSER_TYPE_360;
+    }else if(ua.indexOf("iphone") && ua.indexOf("mobile")){
+        browserType = "safari";
     }
     /**
      * Indicate the running browser type
diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js
@@ -134,11 +134,16 @@
         else
             cc.__audioSupport = supportTable[sys.BROWSER_TYPE_SAFARI];
     }else{
-        //Desktop support all
-        if(cc.sys.browserType != cc.sys.BROWSER_TYPE_IE)
-            cc.__audioSupport = supportTable["common"];
-        else
-            cc.__audioSupport = supportTable[sys.BROWSER_TYPE_IE];
+      switch(sys.browserType){
+          case sys.BROWSER_TYPE_IE:
+              cc.__audioSupport = supportTable[sys.BROWSER_TYPE_IE];
+              break;
+          case sys.BROWSER_TYPE_FIREFOX:
+              cc.__audioSupport = supportTable[sys.BROWSER_TYPE_FIREFOX];
+              break;
+          default:
+              cc.__audioSupport = supportTable["common"];
+      }
     }
 
     if(DEBUG){
diff --git a/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js b/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js
@@ -206,7 +206,7 @@
 
     proto._initWithTotalParticles = function(totalParticles){};
     proto._updateDeltaColor = function(selParticle, dt){
-        if (!this._dontTint) {
+        if (!this._node._dontTint) {
             selParticle.color.r += selParticle.deltaColor.r * dt;
             selParticle.color.g += selParticle.deltaColor.g * dt;
             selParticle.color.b += selParticle.deltaColor.b * dt;
diff --git a/template/index.html b/template/index.html
@@ -23,6 +23,7 @@
     <script src="main.js"></script>
 </head>
 <body style="padding:0; margin: 0; background: #000;">
+<script src="src/loading.js"></script>
 <canvas id="gameCanvas" width="321" height="480"></canvas>
 </body>
 </html>
diff --git a/template/main.js b/template/main.js
@@ -1,4 +1,7 @@
 cc.game.onStart = function(){
+    if(!cc.sys.isNative) //If referenced loading.js, please remove it
+        document.body.removeChild(document.getElementById("cocosLoading"));
+
     var designSize = cc.size(480, 800);
     var screenSize = cc.view.getFrameSize();
 
diff --git a/template/src/loading.js b/template/src/loading.js
diff --git a/tools/build.xml b/tools/build.xml
@@ -5,7 +5,7 @@
              classpath="./compiler/compiler.jar"/>
     <target name="compile">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.3-beta0-min.js">
+                debug="false" output="./../lib/cocos2d-js-v3.3-min.js">
             <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="Base64Images.js"/>
@@ -298,7 +298,7 @@
 
     <target name="compile_core">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.3-beta0-core-min.js">
+                debug="false" output="./../lib/cocos2d-js-v3.3-core-min.js">
             <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-core-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="CCBoot.js"/>

Original file line number	Diff line number	Diff line change
`@@ -1560,6 +1560,8 @@ cc._initSys = function (config, CONFIG_KEY) {`
`1560`	`1560`	`browserType = sys.BROWSER_TYPE_ANDROID;`
`1561`	`1561`	`else if (browserType == "trident") browserType = sys.BROWSER_TYPE_IE;`
`1562`	`1562`	`else if (browserType == "360 aphone") browserType = sys.BROWSER_TYPE_360;`
	`1563`	`+ }else if(ua.indexOf("iphone") && ua.indexOf("mobile")){`
	`1564`	`+ browserType = "safari";`
`1563`	`1565`	`}`
`1564`	`1566`	`/**`
`1565`	`1567`	`* Indicate the running browser type`