Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
yangxiao 75b46e9a09 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-11 16:06:00 +08:00
..
2d merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
3d Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
audio Optimized seek for large file and log output on IOS. 2014-09-11 10:53:01 +08:00
base merge cocos 2014-09-10 10:28:59 +08:00
deprecated Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
editor-support remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
math Merge pull request #7976 from samuele3hu/v3_check_mat 2014-09-11 14:47:39 +08:00
network Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
physics Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
platform Android properties back to 10 2014-09-09 18:46:47 -07:00
renderer merge cocos 2014-09-10 10:28:59 +08:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-09-11 07:11:40 +00:00
storage/local-storage Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
ui remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
Android.mk Merge pull request #7968 from Dhilan007/v3-audio903 2014-09-11 15:23:17 +08:00
CMakeLists.txt Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-11 16:06:00 +08:00
cocos2d-prefix.pch add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
cocos2d.cpp Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
cocos2d.h merge cocos 2014-09-10 10:28:59 +08:00