Skip to content

Commit 92be82d

Browse files
committed
Merge pull request cocos2d#1145 from dingpinglv/DevelopToMaster
Merge develop to master
2 parents 29d4f81 + 4d4b7fc commit 92be82d

File tree

139 files changed

+8560
-10759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+8560
-10759
lines changed

AUTHORS.txt

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Chris @hannon235 added node.js api for box2d
2525

2626
Jason Aeschliman @jaeschliman fixed cc.Node setposition
2727

28-
Sun Zhuoshi(Intel) @sunzhuoshi engine loader fixed
28+
Zhuoshi Sun(Intel) @sunzhuoshi engine loader fixed
2929

3030
Alejandro Reyero @KaTXi fixed error message
3131

@@ -50,15 +50,14 @@ Ivo Wetzel(Zynga Germany) @BonsaiDen Fixes for Audio Support Detection,
5050
Texture Support in Particle System,
5151
and Performance improvements
5252

53-
5453
Mario Adrian @many20 Code review, multi touch improvements,
5554
ccbi bugs fixed
5655

5756
keisuke hata(Square) @Seasons7 Code review, bug fix
5857

5958
Marat Yakupov @moadib Various bug fixes
6059

61-
Wu Liang @akira-cn Touch location fix for designResolution
60+
Liang Wu @akira-cn Touch location fix for designResolution
6261

6362
Jimmy Sambuo @jsambuo AudioEngine improvements
6463

@@ -74,14 +73,29 @@ Szymon Piłkowski @ardcore CCTexture Bug fix
7473

7574
Tomasz Tunik @tomasztunik CCNode Memory leak fix
7675

77-
Lin Xuankang(Intel) @AndriyLin cc.WebAudioEngine implements
76+
Xuankang Lin(Intel) @AndriyLin cc.WebAudioEngine implements
7877

7978
Kang-Hao Lu(Opera/Oupeng) @kennyluck Optimize John Resig's inheritance pattern
8079
cc.clone improvements
8180

8281
Mark Henderson @MarkEHenderson Code review, LabelTTF and Scale9Sprite bug fix
8382

84-
06wj @06wj CCScheduler improvements
83+
Jing Wang @06wj CCScheduler improvements
84+
Js file loading image add
85+
cc.RectApplyAffineTransform improvements
86+
87+
Ze Wang @WanderWang Fix crash when BrowserTypes match nothing from navigator.userAgent
88+
LabelTTF improvements
89+
cc.TextureCache.dumpCachedTextureInfo 's bug fix
90+
91+
Christian Schwartz @cschwartz SpriteFrame.initWithTextureFilename converted fix
92+
93+
XiaoJun Zheng @SmallAiTT _getResType error fix
94+
cc.ScrollView bug fix
95+
96+
Guozhu Cheng @bengol cc.SimpleAudioEngine bug fix
97+
98+
Jing Xiao @xbruce cc.SAXParser bug fix
8599

86100
Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.
87101

CHANGELOG.txt

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
Cocos2d-html5-v2.1.6 @ Sep.19, 2013
2+
* Improved Sprite, Node, LabelTTF class define from separated code to combined code for maintainability, now it is clean and clear
3+
* 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
4+
* cc.Sprite and its subClasses's texture has been replaced from DOM element to cc.Texture2D on Canvas mode
5+
* 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
6+
* Migrated CCBReader and GUI to Cocos2d-x 2.1.4
7+
* Improved update function of Action, and avoid using temporary object, it is good for GC and performance
8+
* 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)
10+
* Added Hiding url address bar for mobile browser, please check the template and hello world
11+
* Re-writed Canvas Mode of RenderTexture to adapt WebGL interface
12+
* 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)
13+
* Set auto render mode default value to canvas in mobile browsers and WebGL in desktop browsers
14+
15+
* Bug fix:
16+
1. Fixed cc.Sprite's displayFrame returns wrong value on Canvas mode.
17+
2. Fixed cc.LabelBMFont is very slow when calling setString
18+
3. Fixed a bug of CCBReader that cc.ControlButton doesn't work when its controller is _jsControlled
19+
4. Fixed a bug of cc.TextureCache that the status of texture is wrong in callback
20+
5. Fixed a bug of cc.Scale9Sprite that its contentSize is wrong when call setCapInsets
21+
6. Fixed a bug of cc.TableView's that contentSize is wrong when change datasource
22+
7. Fixed a bug of cc.Sprite that its children also follow fliped when it was fliped
23+
8. Fixed cc.Node's nodeToWorldTransform returns wrong value on Canvas Mode
24+
9. Fixed a bug of cc.LayerColor that represent incorrect opacity passed into init method
25+
10. Stop listening and remove the event for HtmlImageElement object onload
26+
11. Fixed cc.ProgressTimer display wrong when its sprite was flipped
27+
12. Fixed some bugs for actions that set their object property through reference when initiating actions.
28+
29+
* Known Issues:
30+
1. Effect Advanced Lens3D doesn't work
31+
2. ClipNodeTest effects varies in different browsers
32+
133
Cocos2d-html5-v2.1.5 @ July.24, 2013
234
* Ported engine API to keep the same as Cocos2d-x v2.1.4 API
335
* Optimized John Resig's inheritance pattern (cc.Class.extend) with advanced property initialization.
@@ -8,7 +40,7 @@ Cocos2d-html5-v2.1.5 @ July.24, 2013
840
* Optimized performance for MoonWarriors and CocosDragonJS
941

1042
* Bug fix:
11-
1. Fixed cc.EditBox Dom Element position issue when EGLView is setted
43+
1. Fixed cc.EditBox Dom Element position issue when EGLView is set
1244
2. Fixed cc.EGLView adjustSize bug
1345
3. Fixed the bug of cc.ParticleBatchNode that it doesn't hide particles after particle life has expired when calling stopSystem()
1446
4. Fixed a bug that LabelTTF dimension behavior doesn't support height=0
@@ -17,6 +49,7 @@ Cocos2d-html5-v2.1.5 @ July.24, 2013
1749
* Known Issues:
1850
1. Effect Advanced Lens3D doesn't work
1951
2. ClipNodeTest effects varies in different browsers
52+
3. nodeToParentTransform in cc.Node returns wrong value on Canvas mode
2053

2154
Cocos2d-html5-v2.1.4 @ Jun.12, 2013
2255
* Added support for multiple resources loading. This mechanic is the same as cocos2d-x now

0 commit comments

Comments
 (0)