Skip to content

Commit bd60af2

Browse files
author
SeanLin
committed
Merge pull request cocos2d#1157 from dingpinglv/Iss2844_RenameVersion
Closed cocos2d#2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2
2 parents b0a22ca + 5b14c28 commit bd60af2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CHANGELOG.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Cocos2d-html5-v2.1.6 @ Sep.19, 2013
1+
Cocos2d-html5-v2.2 @ Sep.19, 2013
22
* Improved Sprite, Node, LabelTTF class define from separated code to combined code for maintainability, now it is clean and clear
33
* added a new sample game "Fruit attack" which works great on PC browsers, mobile browsers, and can even be run natively as an android and iOS app with JSB
44
* cc.Sprite and its subClasses's texture has been replaced from DOM element to cc.Texture2D on Canvas mode
55
* Improved cc.Texture2d for direct using without pre-loading image resources, you don't need to wait resources loading when create a new scene or layers
66
* Migrated CCBReader and GUI to Cocos2d-x 2.1.4
77
* Improved update function of Action, and avoid using temporary object, it is good for GC and performance
88
* Modified LabelTTF's rendering from direct drawing to pre-rendering for performance, 100% faster than before on mobile browser
9-
* Fixed APIs of HTML5 according to JSB for compatibility, e.g. cc.ParticleSystemQuad has merged into cc.ParticleSystem, please check it on upgrade guide v2.1.5 to v2.1.6(http://www.cocos2d-x.org/wiki/Upgrade_Guide_from_Cocos2d-html5_v215_to_v216)
9+
* Fixed APIs of HTML5 according to JSB for compatibility, e.g. cc.ParticleSystemQuad has merged into cc.ParticleSystem, please check it on upgrade guide v2.1.5 to v2.2(http://www.cocos2d-x.org/wiki/Upgrade_Guide_from_Cocos2d-html5_v215_to_v22)
1010
* Added Hiding url address bar for mobile browser, please check the template and hello world
1111
* Re-writed Canvas Mode of RenderTexture to adapt WebGL interface
1212
* Added frame event, collider and blend type supporting for Armature. Now Armature supports two tools:1.CocoStudio(windows,http://www.cocostudio.org),2.DragonBones(flash, https://github.com/2youyouo2/SkeletonAnimationDesignPanel)

cocos2d/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<target name="compile_Canvas">
88
<jscomp compilationLevel="simple" warning="quiet"
9-
debug="false" output="../lib/Cocos2d-html5-v2.1.6.min.js">
9+
debug="false" output="../lib/Cocos2d-html5-v2.2.min.js">
1010
<externs dir="${basedir}">
1111
<file name="cocos2d_externs.js"/>
1212
</externs>

cocos2d/platform/CCConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @constant
3434
* @type String
3535
*/
36-
cc.ENGINE_VERSION = "Cocos2d-html5-v2.1.6";
36+
cc.ENGINE_VERSION = "Cocos2d-html5-v2.2";
3737

3838
/**
3939
* <p>

0 commit comments

Comments
 (0)