| .. |
|
2d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:47:16 +08:00 |
|
3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:47:16 +08:00 |
|
audio
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
|
base
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:47:16 +08:00 |
|
deprecated
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
editor-support
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
math
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
network
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
physics
|
fix transform for physics.
|
2014-06-27 17:30:21 +08:00 |
|
platform
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:47:16 +08:00 |
|
renderer
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:47:16 +08:00 |
|
scripting/lua-bindings
|
[AUTO]: updating luabinding automatically
|
2014-07-10 02:03:40 +00:00 |
|
storage
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
ui
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
Android.mk
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
|
2014-07-04 17:03:48 +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: update version]
|
2014-07-07 17:24:14 +08:00 |
|
cocos2d.h
|
add 3d file to cocos2d.h
|
2014-07-08 11:02:29 +08:00 |
9b0bab26b6