| .. |
|
2d
|
fix merge conflitcts on windows
|
2014-06-29 20:30:26 +08:00 |
|
3d
|
remove unused code
|
2014-06-27 22:11:29 +08:00 |
|
audio
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
|
base
|
Merge branch 'v3' into fast_tmx
|
2014-06-29 20:23:43 +08:00 |
|
deprecated
|
CCLOGINFO compilation fix
|
2014-06-19 20:59:08 +04:00 |
|
editor-support
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-30 11:08:22 +08:00 |
|
math
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
|
network
|
put request param in lambda in HttpClient::networkThreadAlone
|
2014-06-26 02:03:53 +08:00 |
|
physics
|
fix transform for physics.
|
2014-06-27 17:30:21 +08:00 |
|
platform
|
added source files for component to be consistent with other platforms templates
|
2014-06-25 09:51:32 -07:00 |
|
renderer
|
Merge branch 'v3' into fast_tmx
|
2014-06-29 20:23:43 +08:00 |
|
scripting/lua-bindings
|
[AUTO]: updating luabinding automatically
|
2014-06-29 09:28:33 +00:00 |
|
storage
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
|
ui
|
fix platform compile error
|
2014-06-27 16:11:35 +08:00 |
|
Android.mk
|
Merge branch 'v3' into fast_tmx
|
2014-06-29 20:23:43 +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-06-17 18:42:10 +08:00 |
|
cocos2d.h
|
change ActionTimeline to cocostudio ActionTimeline folder
|
2014-06-13 18:51:32 +08:00 |
30a13c05c9