| .. |
|
2d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-08-21 13:48:05 +03:00 |
|
3d
|
Add a newline for some files
|
2014-08-18 15:27:54 +08:00 |
|
audio
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
|
2014-08-07 11:58:01 +08:00 |
|
base
|
use macro to control whether to use jpeg, tiff, webp or not
|
2014-08-21 15:19:26 +08:00 |
|
deprecated
|
Merge branch 'v3' into v3_dll
|
2014-07-17 14:12:10 +08:00 |
|
editor-support
|
Merge pull request #7825 from 2youyouo2/v3
|
2014-08-20 10:23:15 +08:00 |
|
math
|
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
|
2014-08-15 13:20:37 +03:00 |
|
network
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
|
physics
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
|
2014-08-12 10:20:34 +08:00 |
|
platform
|
fix compiling error on android and fix some coding style
|
2014-08-21 15:41:05 +08:00 |
|
renderer
|
fix android background and foreground crash for primitive
|
2014-08-15 14:05:17 +08:00 |
|
scripting/lua-bindings
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
|
storage
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
|
ui
|
Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue
|
2014-08-20 10:11:59 +08:00 |
|
Android.mk
|
fix compiling error on android and fix some coding style
|
2014-08-21 15:41:05 +08:00 |
|
CMakeLists.txt
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
|
cocos2d-prefix.pch
|
Squashed commit of the following:
|
2014-05-16 14:36:00 -07:00 |
|
cocos2d.cpp
|
! Set version to 3.3 (as it is no longer 3.2)
|
2014-08-21 18:04:46 +03:00 |
|
cocos2d.h
|
! Set version to 3.3 (as it is no longer 3.2)
|
2014-08-21 18:04:46 +03:00 |
4563e65427