{"push_id":692869994,"size":97,"distinct_size":1,"ref":"refs/heads/fix_download_deps","head":"853058102dd74fc0cebec9557851846209059037","before":"76a3db6f29f28db6bf4dcf4bf9a3433d5eeaf900","commits":[{"sha":"cc0b3ffd2ef62c1a515f68a08dbe86817ba14ff1","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Merge branch 'v3' into v3_addClearforCamera\n\nConflicts:\n\tcocos/renderer/CCGLProgramCache.cpp\n\ttests/cpp-tests/Classes/controller.cpp","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/cc0b3ffd2ef62c1a515f68a08dbe86817ba14ff1"},{"sha":"35940ba8ef58a818aad76e38ece5363bc1350859","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Merge branch 'v3_addClearforCamera' of github.com:dabingnn/cocos2d-x into v3_addClearforCamera","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/35940ba8ef58a818aad76e38ece5363bc1350859"},{"sha":"f0acf7ee7b0e972555ebf7682154bafebec8f822","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"original version of frame buffer object","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/f0acf7ee7b0e972555ebf7682154bafebec8f822"},{"sha":"42514ee62f4b6860ae97878adf2238fcf97dc50f","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"FrameBufferObject works","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/42514ee62f4b6860ae97878adf2238fcf97dc50f"},{"sha":"6097b4ddd20c7785734b6f296d74439f25a6af9b","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"add clearAllFBOs function in FrameBufferObject","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/6097b4ddd20c7785734b6f296d74439f25a6af9b"},{"sha":"8311cf8920701e3c790d7dee11b4d2438b4bbc09","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Fix clearcolor overwrite bug\nchange test case for FrameBufferObject","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/8311cf8920701e3c790d7dee11b4d2438b4bbc09"},{"sha":"e6e0a1d15c1816f9eae8f8ab374b58040072784d","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/e6e0a1d15c1816f9eae8f8ab374b58040072784d"},{"sha":"57a3fa256a10197077b9c839cf5ba5eaaf832c43","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Fix memory leak for FrameBufferObject","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/57a3fa256a10197077b9c839cf5ba5eaaf832c43"},{"sha":"f96e704f7d182554e6503b65be16904eb73fc57d","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Merge branch 'v3' into v3FrameBufferObject\n\nConflicts:\n\tbuild/cocos2d_libs.xcodeproj/project.pbxproj\n\tcocos/cocos2d.h\n\tcocos/renderer/CCGLProgramCache.cpp","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/f96e704f7d182554e6503b65be16904eb73fc57d"},{"sha":"45248f7410a6efdcb278546ec8bc630175f8b9cd","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"works on ios and mac","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/45248f7410a6efdcb278546ec8bc630175f8b9cd"},{"sha":"5634609e05135473ab53d36f4764bea46c8b0d14","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"android works","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/5634609e05135473ab53d36f4764bea46c8b0d14"},{"sha":"75f740add5659fb3c7c076a32ff2b46462afa92c","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"linux works","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/75f740add5659fb3c7c076a32ff2b46462afa92c"},{"sha":"628619a694e60f2c19613bdc993e6708030e190c","author":{"email":"6baf7bdf6528f834b37e76495157da8630780464@cocos2d-x.org","name":"Vincent Yang"},"message":"Add CCFrameBufferObject files to win32 and win8 vcproj.","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/628619a694e60f2c19613bdc993e6708030e190c"},{"sha":"8d3ade78cab4ce12054e7b6ecad32012bdc096fe","author":{"email":"6baf7bdf6528f834b37e76495157da8630780464@cocos2d-x.org","name":"Vincent Yang"},"message":"Add CC_DLL to Class FrameBufferObject.","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/8d3ade78cab4ce12054e7b6ecad32012bdc096fe"},{"sha":"c22a8e81cebe8481ec3c5ba0aa2e2a135f899462","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Merge branch 'v3' into v3FrameBufferObject","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/c22a8e81cebe8481ec3c5ba0aa2e2a135f899462"},{"sha":"83bae15cafbbac217a4ac3c8f8075992c9ab8f56","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject\n\n# Conflicts:\n#\tcocos/2d/libcocos2d.vcxproj.filters\n#\tcocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/83bae15cafbbac217a4ac3c8f8075992c9ab8f56"},{"sha":"c19adbdc3c2fe59b5bd291e3cde10d4964c18cc9","author":{"email":"2a87e1e5a33bbfb0d91012fa93e4a61698d95536@gmail.com","name":"geron-cn"},"message":"fix bug:  fix actiontimeline can not step to last frame when loop play","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/c19adbdc3c2fe59b5bd291e3cde10d4964c18cc9"},{"sha":"471547e0b0c2c18524f475290dff5284c625e0a4","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"refactor FrameBufferObject to FrameBufferObject and RenderTarget","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/471547e0b0c2c18524f475290dff5284c625e0a4"},{"sha":"9d4e50f3a5c3ea0b721ddb93751fab5902f5fa8c","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"add optional params for RenderTarget creation","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/9d4e50f3a5c3ea0b721ddb93751fab5902f5fa8c"},{"sha":"9ffbe39f18613921e3b0de29d9c0234aae6507a9","author":{"email":"bac8f8c598c2d3710715861640b972c9caceab31@gmail.com","name":"Huabing.Xu"},"message":"DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget","distinct":false,"url":"https://api.github.com/repos/oscr/cocos2d-x/commits/9ffbe39f18613921e3b0de29d9c0234aae6507a9"}]}