axmol/cocos
kaile.yin fd69a5efc3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
..
2d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
3d Merge pull request #9306 from super626/v3 2014-12-03 14:04:59 +08:00
audio Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
base CCRANDOM_() uses std::rand() because it can be seeded with std::srand() 2014-11-26 20:07:42 -08:00
deprecated Multi platform cmake support 2014-10-03 23:21:45 +01:00
editor-support Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
math Update MathUtilNeon64.inl 2014-11-25 10:33:16 +08:00
network Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
physics try to fix ubuntu 12.04 compile error 2014-10-10 17:27:15 +08:00
platform Merge pull request #9224 from pjc0247/v3 2014-12-03 14:15:38 +08:00
renderer Merge pull request #9130 from samael65535/patch-1 2014-11-26 13:51:15 +08:00
scripting/lua-bindings Merge pull request #9327 from samuele3hu/v3_manual_bindings 2014-12-03 14:17:16 +08:00
storage fix typo of file name 2014-10-17 16:29:37 +08:00
ui add null pointer check, make code more robust 2014-11-27 18:25:13 +08:00
Android.mk Revert "Merge pull request #9193 from pipu/v3_flatbuffers" 2014-11-24 10:19:53 -08:00
CMakeLists.txt Move prebuilt libraries config to distinct file. 2014-11-20 12:05:15 +03:00
cocos2d.cpp fixes compiler warnings 2014-11-14 13:07:34 -08:00
cocos2d.h Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00