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 |
base
|
even more cmake fixes
|
2014-09-11 17:36:49 -07:00 |
deprecated
|
Adds MARK: TODO: FIXME: in code
|
2014-08-29 12:54:24 -07:00 |
editor-support
|
remove deprecated warning
|
2014-09-12 17:06:13 +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
|
even more cmake fixes
|
2014-09-11 17:36:49 -07:00 |
renderer
|
merge cocos
|
2014-09-10 10:28:59 +08:00 |
scripting/lua-bindings
|
remove deprecated warning
|
2014-09-12 17:06:13 +08: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 |
cocos2d.h
|
merge cocos
|
2014-09-10 10:28:59 +08:00 |