| .. |
|
2d
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
|
3d
|
Merge branch 'v3' into v3_dll
|
2014-07-17 14:12:10 +08:00 |
|
audio
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
|
base
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
|
deprecated
|
Merge branch 'v3' into v3_dll
|
2014-07-17 14:12:10 +08:00 |
|
editor-support
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +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
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
|
platform
|
Merge branch 'v3' into v3_dll
|
2014-07-17 14:12:10 +08:00 |
|
renderer
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +08:00 |
|
scripting/lua-bindings
|
Fix type judgment error.
|
2014-07-17 16:41:09 +08:00 |
|
storage
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
|
ui
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
|
Android.mk
|
disable warn on zero-sized structures.
|
2014-07-14 17:53:55 +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 |
52ac47aea8