GitHub PushEvent at 2014-03-07 15:11:27
Repository: quick-cocos2d-x
Actor: toss156
Payload: {"shas":[["4db6912d6f7148c3f7a76c4cfc894409d5ec65e4","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","add CocoStudio lua support","rrobin",true],["cd6c8dbc6760c3562eeb4ac868bf096f651f0f67","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","modify Android.mk","rrobin",true],["fae44ade7acaccce9aebe1ad31ca1bc0951032f3","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","Merge remote-tracking branch 'remotes/upstearm/develop' into develop\n\nConflicts:\n\tlib/framework_precompiled/framework_precompiled.zip\n\tplayer/bin/win32/quick-x-player.exe\n\tsamples/iap4ios/res/framework_precompiled.zip\n\tsamples/luajavabridge/res/framework_precompiled.zip\n\ttemplate/PROJECT_TEMPLATE_01/res/framework_precompiled.zip","rrobin",true],["28748049c449cc608ba3e84fbec3aa8579209bae","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","添加所有的关于ccs的代码","rrobin",true],["fb740a5d25eb9b951120e5152c028160c9b8c08f","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","修改了一个会导致textField无法设置限制显示文字长度的bug\n给widget_table添加了一个extend方法,以便自定义widget需要扩展的方法\n添加了textField的示例","rrobin",true],["d8224aa284dcc8ca871a9215fc3b8f93e00b44f6","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","Merge remote-tracking branch 'remotes/upstearm/develop' into develop\n\nConflicts:\n\tlib/cocos2d-x/scripting/lua/cocos2dx_support/LuaCocos2d.cpp\n\tplayer/bin/win32/quick-x-player.exe","rrobin",true],["db20c2946b66d2d4b2457c9e702952d5781c2ed0","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","合并quick-x原作者的develop最新版","rrobin",true],["2b6fcd981e00ac149235662b45b2cbf5bc8f3328","90f9fcb61e9c73ab4eaffafac398dcc048ed2e14@gmail.com","Merge pull request #191 from rrobin/develop\n\nccs lua support","YuLei Liao",true],["c6f08ae23b25ce98b88e279745c72f6b96e97bb8","6e465aeb06ab6b5df498330c323f6bd83cab7d9a@qq.com","增加了scene读取示例","rrobin",true],["edb005f41b7bcf64366048f89dffd82a5dabbc74","90f9fcb61e9c73ab4eaffafac398dcc048ed2e14@gmail.com","Merge pull request #192 from rrobin/add_ccs_support\n\n增加了scene读取示例","YuLei Liao",true],["097083d009303f44b70708cadd32dcb841a6a6ca","c050d34f8b76c0aace3b84ba133691a72ef35f63@qq.com","Merge pull request #3 from rrobin/feature/add_ccs_support\n\nFeature/add ccs support","toss156",true]],"size":11,"ref":"refs/heads/develop","head":"097083d009303f44b70708cadd32dcb841a6a6ca"}