| .. |
|
2d
|
fix windows compile error
|
2014-07-21 14:59:47 +08:00 |
|
3d
|
Merge pull request #7526 from chenguangqi/v3
|
2014-07-21 13:54:31 +08:00 |
|
audio
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
|
base
|
Merge branch 'v3' into v3_dll
|
2014-07-18 14:01:17 +08:00 |
|
deprecated
|
Merge branch 'v3' into v3_dll
|
2014-07-17 14:12:10 +08:00 |
|
editor-support
|
Merge pull request #7518 from natural-law/android-dependencies
|
2014-07-18 17:57:42 +08:00 |
|
math
|
add CC_DLL for functions
|
2014-07-15 11:18:05 +08:00 |
|
network
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
physics
|
Mac dylib version works now
|
2014-07-17 20:58:50 +08:00 |
|
platform
|
fix Label::setTextColor did not have any effect.
|
2014-07-22 14:52:41 +08:00 |
|
renderer
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +08:00 |
|
scripting/lua-bindings
|
[AUTO]: updating luabinding automatically
|
2014-07-21 03:57:41 +00:00 |
|
storage
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
ui
|
Merge pull request #7517 from dabingnn/v3_dll
|
2014-07-21 11:53:36 +08:00 |
|
Android.mk
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
|
CMakeLists.txt
|
Squashed commit of the following:
|
2014-05-18 14:49:16 -07:00 |
|
cocos2d-prefix.pch
|
Squashed commit of the following:
|
2014-05-16 14:36:00 -07:00 |
|
cocos2d.cpp
|
[ci skip]
|
2014-07-15 15:11:17 +08:00 |
|
cocos2d.h
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-11 16:44:59 +08:00 |
bb7d6ba3d4