Merge pull request cocos2d#960 from linshun/iss2264_v2.1.4

fixed cocos2d#2264: added Version release note to changelog, and changed versio...

Author: SeanLin

CHANGELOG.txt

@@ -1,3 +1,22 @@
+Cocos2d-html5-v2.1.4 @ Jun.12, 2013
+* Added support for Multi resources loading
+* Performance optimization for sprite performance tests 220%
+* Sync audio api to JSB
+* Added auto test for NodeTests
+* Changed textureKeyName to full path when removeTextureForKey
+* Added support for particle batch node
+
+*Bug fix:
+  1. PreLoading on iOS5.1.1
+  2. cc.Menu / cc.MenuItemImage remain touchable after replaceScene
+  3. Box2d and chipmunk path error for single file mode
+  4. cc.EditBox that position of Dom Element is wrong when cc.EditBox skewed
+  5. cc.ScrollView position  is wrong when it's parent node moved
+  6. cc.TouchDispatcher can't touch when WebPage has been scrolled on Firefox and IE
+* Known Issues:
+     1. Effect Advanced Lens3D doesn't work
+     2. ClipNodeTest effects varies in different browsers
+
 Cocos2d-html5-v2.1.3 @ May.1, 2013
 * CCEditbox now implemented for WebGL and JSB
 * Updated CCBReader to latest version

cocos2d/build.xml

@@ -6,7 +6,7 @@
 
     <target name="compile_Canvas">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="../lib/Cocos2d-html5-v2.1.3.min.js">
+                debug="false" output="../lib/Cocos2d-html5-v2.1.4.min.js">
             <externs dir="${basedir}">
                 <file name="cocos2d_externs.js"/>
             </externs>

cocos2d/platform/CCConfig.js

@@ -33,7 +33,7 @@
  * @constant
  * @type String
  */
-cc.ENGINE_VERSION = "Cocos2d-html5-v2.1.3";
+cc.ENGINE_VERSION = "Cocos2d-html5-v2.1.4";
 
 /**
  * <p>