{"head":"debcc86a3eb3426848500ab06cd0cc57ee8684b6","size":391,"push_id":46835401,"commits":[{"sha":"aeda5a23fe5568b80b1e2628500212b40b8f54e8","author":{"name":"natural-law","email":"9a5d56716d566997fa290054d161af96305aff9a@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/aeda5a23fe5568b80b1e2628500212b40b8f54e8","message":"fixed #636, Modify the implementation of method CCTextureCache::textureForKey()."},{"sha":"866bfb870aba0666bd2bbe188b39c8261a0aa59f","author":{"name":"natural-law","email":"9a5d56716d566997fa290054d161af96305aff9a@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/866bfb870aba0666bd2bbe188b39c8261a0aa59f","message":"fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter."},{"sha":"bc8d6cf1fa61469b5ce844c6c85300692f9cdd00","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/bc8d6cf1fa61469b5ce844c6c85300692f9cdd00","message":"issue #347: android can use ttf file"},{"sha":"37b1e9f73c36b3f90a1e06458e5f8fe06fc5bd29","author":{"name":"RongHong","email":"9f00a84fb35de357f89017cb06b7e92a30c5a4af@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/37b1e9f73c36b3f90a1e06458e5f8fe06fc5bd29","message":"issue #608 rendertexture disappears after going to background"},{"sha":"9064e76be402077c5e1654f80cbd60baed516571","author":{"name":"RongHong","email":"9f00a84fb35de357f89017cb06b7e92a30c5a4af@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/9064e76be402077c5e1654f80cbd60baed516571","message":"fixed #640 the image read from render texture is upseted"},{"sha":"76dded7bf0dcc76f8cef78fa98ea93279bd1e2e9","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/76dded7bf0dcc76f8cef78fa98ea93279bd1e2e9","message":"Merge https://github.com/cocos2d/cocos2d-x into iss347"},{"sha":"912dbb06788ac43cc9b699a9810327bcb3d1cc93","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/912dbb06788ac43cc9b699a9810327bcb3d1cc93","message":"Merge pull request #430 from natural-law/master\n\nfixed #636"},{"sha":"93f6a11d5423a3ce0ea8e34e1d6d71028d8aca08","author":{"name":"reflog","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/93f6a11d5423a3ce0ea8e34e1d6d71028d8aca08","message":"changes to support CCScrollLayer"},{"sha":"3320d2655f53fef234a586521320469066f79504","author":{"name":"Eli Yukelzon","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/3320d2655f53fef234a586521320469066f79504","message":"parallel build"},{"sha":"ea7bc9d38e671f67ce6703f64e9f8537310da1d1","author":{"name":"Eli Yukelzon","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/ea7bc9d38e671f67ce6703f64e9f8537310da1d1","message":"modification to support radio menu"},{"sha":"0bcc6a15a11360967e0e354584d0133fcb262095","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/0bcc6a15a11360967e0e354584d0133fcb262095","message":"Merge pull request #431 from flyingpacer/640\n\nfixed #640 the image read from render texture is upseted"},{"sha":"706c4c28536f3da3b40cca72724351f4fd74b5d2","author":{"name":"natural-law","email":"9a5d56716d566997fa290054d161af96305aff9a@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/706c4c28536f3da3b40cca72724351f4fd74b5d2","message":"Resolve the cocos2d compile error on wophone."},{"sha":"b467cae89885a491f2765fc97062d7c269fdcf8e","author":{"name":"natural-law","email":"9a5d56716d566997fa290054d161af96305aff9a@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/b467cae89885a491f2765fc97062d7c269fdcf8e","message":"Merge branch 'master' of https://github.com/cocos2d/cocos2d-x\n\nConflicts:\n\tcocos2dx/platform/CCImage.cpp"},{"sha":"4e073668413729b48270888cfb7b9fae301d350a","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/4e073668413729b48270888cfb7b9fae301d350a","message":"issue #347: iOS support font defined by ttf file"},{"sha":"7d97af03c04b5618df659a3a923887e241a32b55","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/7d97af03c04b5618df659a3a923887e241a32b55","message":"issue #347: update xcode3 template for ttf support"},{"sha":"2c5f64f66eb15fc0a720fd857b59c083cfc4c58b","author":{"name":"RongHong","email":"9f00a84fb35de357f89017cb06b7e92a30c5a4af@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/2c5f64f66eb15fc0a720fd857b59c083cfc4c58b","message":"fixed #641 the user could save buffer to any path"},{"sha":"516d60ec609d1b76bce1d6e709d9e50bf52a39a7","author":{"name":"minggo","email":"b256bf5c5991b0736a9317f8cfe238295bfd8db0@cocos2d-x.org"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/516d60ec609d1b76bce1d6e709d9e50bf52a39a7","message":"issue #347: add tests for FontTest & it works ok on android"},{"sha":"304770be987b3d348babe2a8f2a389e86fd29cc5","author":{"name":"Eli Yukelzon","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/304770be987b3d348babe2a8f2a389e86fd29cc5","message":"Merge remote-tracking branch 'upstream/master'"},{"sha":"1b5cc54386633e97b5a2fabf883cfd6679a5aca6","author":{"name":"Eli Yukelzon","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/1b5cc54386633e97b5a2fabf883cfd6679a5aca6","message":"usuful macros for defining scene() and node() methods with params"},{"sha":"4fc418d918d1e27d55e43a2c08a82b01cb9f629f","author":{"name":"Eli Yukelzon","email":"8d35cce5f5631cd65150639e28c4a798c11d747c@gmail.com"},"url":"https://api.github.com/repos/flyingpacer/cocos2d-x/commits/4fc418d918d1e27d55e43a2c08a82b01cb9f629f","message":"added support for optional default values in CCUserDefault getters"}],"ref":"refs/heads/master","legacy":{"head":"debcc86a3eb3426848500ab06cd0cc57ee8684b6","size":391,"push_id":46835401,"shas":[["aeda5a23fe5568b80b1e2628500212b40b8f54e8","bin@cocos2d-x.org","fixed #636, Modify the implementation of method CCTextureCache::textureForKey().","natural-law"],["866bfb870aba0666bd2bbe188b39c8261a0aa59f","bin@cocos2d-x.org","fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter.","natural-law"],["bc8d6cf1fa61469b5ce844c6c85300692f9cdd00","ming@cocos2d-x.org","issue #347: android can use ttf file","minggo"],["37b1e9f73c36b3f90a1e06458e5f8fe06fc5bd29","flyingpacer@gmail.com","issue #608 rendertexture disappears after going to background","RongHong"],["9064e76be402077c5e1654f80cbd60baed516571","flyingpacer@gmail.com","fixed #640 the image read from render texture is upseted","RongHong"],["76dded7bf0dcc76f8cef78fa98ea93279bd1e2e9","ming@cocos2d-x.org","Merge https://github.com/cocos2d/cocos2d-x into iss347","minggo"],["912dbb06788ac43cc9b699a9810327bcb3d1cc93","ming@cocos2d-x.org","Merge pull request #430 from natural-law/master\n\nfixed #636","minggo"],["93f6a11d5423a3ce0ea8e34e1d6d71028d8aca08","reflog@gmail.com","changes to support CCScrollLayer","reflog"],["3320d2655f53fef234a586521320469066f79504","reflog@gmail.com","parallel build","Eli Yukelzon"],["ea7bc9d38e671f67ce6703f64e9f8537310da1d1","reflog@gmail.com","modification to support radio menu","Eli Yukelzon"],["0bcc6a15a11360967e0e354584d0133fcb262095","ming@cocos2d-x.org","Merge pull request #431 from flyingpacer/640\n\nfixed #640 the image read from render texture is upseted","minggo"],["706c4c28536f3da3b40cca72724351f4fd74b5d2","bin@cocos2d-x.org","Resolve the cocos2d compile error on wophone.","natural-law"],["b467cae89885a491f2765fc97062d7c269fdcf8e","bin@cocos2d-x.org","Merge branch 'master' of https://github.com/cocos2d/cocos2d-x\n\nConflicts:\n\tcocos2dx/platform/CCImage.cpp","natural-law"],["4e073668413729b48270888cfb7b9fae301d350a","ming@cocos2d-x.org","issue #347: iOS support font defined by ttf file","minggo"],["7d97af03c04b5618df659a3a923887e241a32b55","ming@cocos2d-x.org","issue #347: update xcode3 template for ttf support","minggo"],["2c5f64f66eb15fc0a720fd857b59c083cfc4c58b","flyingpacer@gmail.com","fixed #641 the user could save buffer to any path","RongHong"],["516d60ec609d1b76bce1d6e709d9e50bf52a39a7","ming@cocos2d-x.org","issue #347: add tests for FontTest & it works ok on android","minggo"],["304770be987b3d348babe2a8f2a389e86fd29cc5","reflog@gmail.com","Merge remote-tracking branch 'upstream/master'","Eli Yukelzon"],["1b5cc54386633e97b5a2fabf883cfd6679a5aca6","reflog@gmail.com","usuful macros for defining scene() and node() methods with params","Eli Yukelzon"],["4fc418d918d1e27d55e43a2c08a82b01cb9f629f","reflog@gmail.com","added support for optional default values in CCUserDefault getters","Eli Yukelzon"]],"ref":"refs/heads/master"}}