axmol/cocos
samuele3hu e848167b25 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-22 15:44:33 +08:00
..
2d Merge pull request #5142 from Dhilan007/develop_label 2014-01-21 19:35:45 -08:00
audio Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
base issue #3713: every autorelease will cause a release operation 2014-01-22 11:40:07 +08:00
editor-support Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
gui Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
math/kazmath Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
network fix compiling error cause by undefined ssize_t on vs. 2014-01-21 09:52:43 +08:00
physics removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
scripting Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-22 15:44:33 +08:00
storage/local-storage Compilation fixes in LocalStorage. include localStorage.h. 2014-01-20 23:01:44 +08:00