axmol/cocos
boyu0 d7106d49be Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
..
2d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
audio added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
base issue #2790: Compilation error fix in CCMap.h. 2013-12-12 14:36:59 +08:00
editor-support Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
gui Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
math/kazmath Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
network issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
physics issue #2790: Removes unneeded dynamic_cast in CCPhyicsWorld.cpp. 2013-12-11 22:09:59 +08:00
scripting Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
storage/local-storage perfect vs-project configuration 2013-10-31 10:51:38 +08:00