diff --git a/AUTHORS.txt b/AUTHORS.txt index f7e4b3807b..936b4582cc 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -15,8 +15,34 @@ Core Developers: Ricardo Quesada -Developers: - +Contributors: +Name GithubID Main contribution + +Dali Kilani @dadilcool added instruction to read me + +Chris @hannon235 added node.js api for box2d + +Jason Aeschliman @jaeschliman fix cc.Node setposition + +Sun Zhuoshi(Intel) @sunzhuoshi engine loader fix + +Alejandro Reyero @KaTXi fix error message + +Long Xiang @seanlong resource loader count + +Timm Drevensek(Zynga) @timmjd cc.Class fix + add CCScale9Sprite test + +Lzzy Chen @czizzy audio engine fix + cleanup comments + +Mcscooter @mcscooter tilempapxml fix + +Roed @roed mouse rightclick api + +Surith Thekkiam(Zynga) @folecr match Cocos2dx api + +Robert Boyd @rboyd fix stackable actions Cocos2d-x and cocos2d-html5 can not grow so fast without the active community. diff --git a/samples b/samples index 6fe2ddb0e2..9ef674e77e 160000 --- a/samples +++ b/samples @@ -1 +1 @@ -Subproject commit 6fe2ddb0e2dd7c37b463a246d3cf31fa1668441f +Subproject commit 9ef674e77e86fbe9ef93caf28b371f9e3d2fe1ab