Skip to content

Issue #2803: correct some mistakes in AUTHORS.txt #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2013
Merged

Issue #2803: correct some mistakes in AUTHORS.txt #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bd376a
Issue #2803: correct some mistakes in AUTHORS.txt
dingpinglv Sep 16, 2013
2b28db7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions AUTHORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Chris @hannon235 added node.js api for box2d

Jason Aeschliman @jaeschliman fixed cc.Node setposition

Sun Zhuoshi(Intel) @sunzhuoshi engine loader fixed
Zhuoshi Sun(Intel) @sunzhuoshi engine loader fixed

Alejandro Reyero @KaTXi fixed error message

Expand Down Expand Up @@ -58,7 +58,7 @@ keisuke hata(Square) @Seasons7 Code review, bug fix

Marat Yakupov @moadib Various bug fixes

Wu Liang @akira-cn Touch location fix for designResolution
Liang Wu @akira-cn Touch location fix for designResolution

Jimmy Sambuo @jsambuo AudioEngine improvements

Expand All @@ -74,25 +74,25 @@ Szymon Piłkowski @ardcore CCTexture Bug fix

Tomasz Tunik @tomasztunik CCNode Memory leak fix

Lin Xuankang(Intel) @AndriyLin cc.WebAudioEngine implements
Xuankang Lin(Intel) @AndriyLin cc.WebAudioEngine implements

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

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

Wang Jing @06wj CCScheduler improvements
Jing Wang @06wj CCScheduler improvements
Js file loading image add
cc.RectApplyAffineTransform improvements

Wang Ze @WanderWang Fix crash when BrowserTypes match nothing from navigator.userAgent
Ze Wang @WanderWang Fix crash when BrowserTypes match nothing from navigator.userAgent

Christian Schwartz @cschwartz SpriteFrame.initWithTextureFilename converted fix

Zhen XiaoJun @SmallAiTT _getResType error fix
XiaoJun Zheng @SmallAiTT _getResType error fix
cc.ScrollView bug fix

Cheng Guozhu @bengol cc.SimpleAudioEngine bug fix
Guozhu Cheng @bengol cc.SimpleAudioEngine bug fix

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

Expand Down
2 changes: 2 additions & 0 deletions tools/jsdoc_toolkit/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<source file="${src.dir}/support/CCPointExtension.js"/>
<source file="${src.dir}/support/CCPNGReader.js"/>
<source file="${src.dir}/support/CCTIFFReader.js"/>
<source file="${src.dir}/support/component/CCComponent.js"/>
<source file="${src.dir}/support/component/CCComponentContainer.js"/>
<source file="${src.dir}/base_nodes/CCNode.js"/>
<source file="${src.dir}/base_nodes/CCdomNode.js"/>
<source file="${src.dir}/base_nodes/CCAtlasNode.js"/>
Expand Down