boyu0
|
a2b611d8c3
|
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
|
2013-07-25 21:35:00 +08:00 |
minggo
|
d44333ce37
|
issue #2430:build lua correctly
|
2013-07-25 21:26:26 +08:00 |
minggo
|
e95c3b9150
|
issue #2430:make functions really deprecated
|
2013-07-25 21:15:24 +08:00 |
James Chen
|
fbb867381c
|
Merge pull request #3256 from CocosRobot/updategeneratedsubmodule_1374757673
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-25 06:15:10 -07:00 |
minggo
|
f5b116095c
|
issue #2430:make functions really deprecated
|
2013-07-25 21:09:44 +08:00 |
CocosRobot
|
74cdb25f8f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-25 13:07:58 +00:00 |
minggo
|
8b748e2992
|
issue #2430:use const member variable instead of macro
|
2013-07-25 21:04:32 +08:00 |
James Chen
|
4505e07585
|
Merge pull request #3255 from samuele3hu/deprectedOperator
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
|
2013-07-25 05:59:43 -07:00 |
minggo
|
051caf5e54
|
issue #2430:move TransitionScene enum into class
|
2013-07-25 20:50:39 +08:00 |
samuele3hu
|
6854bd6b19
|
issue #2404:replace LuaEngine::defaultEngine() with LuaEngine::getInstance()
|
2013-07-25 20:40:44 +08:00 |
minggo
|
df48f52aa3
|
issue #2430:use Image::Format instead of tImageFormat
|
2013-07-25 20:38:15 +08:00 |
minggo
|
2bb577be8b
|
issue #2430:change Image enum item to upper letter
|
2013-07-25 20:29:53 +08:00 |
minggo
|
18a19d5168
|
issue #2430:move Layer enum into class
|
2013-07-25 20:12:55 +08:00 |
minggo
|
beb192ecaa
|
issue #2430:move Menu enum into class
|
2013-07-25 20:04:24 +08:00 |
samuele3hu
|
456a26d7ab
|
issue #2404:Modify tab to spaces
|
2013-07-25 20:03:58 +08:00 |
samuele3hu
|
11d7c9c653
|
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
|
2013-07-25 19:58:59 +08:00 |
minggo
|
77afae124b
|
issue #2430:move Texture2D enum into class
|
2013-07-25 19:52:44 +08:00 |
metalbass
|
2982a42fbf
|
Fixed typo. virutal -> virtual
|
2013-07-25 13:03:40 +02:00 |
metalbass
|
c7329e9301
|
Added virtual destructors to some interfaces to fix issue 3095
|
2013-07-25 12:54:51 +02:00 |
minggo
|
2293630335
|
issue #2430:move enum in ccTypes.h class
|
2013-07-25 18:46:43 +08:00 |
James Chen
|
f40c5aa280
|
Merge pull request #3250 from dumganhar/develop
closed 2431: Potential crash when loading js files.
|
2013-07-25 02:59:42 -07:00 |
James Chen
|
0e1bbcfa90
|
closed #2431: Potential crash when loading js files.
|
2013-07-25 17:58:15 +08:00 |
minggo
|
acdd1cfe9d
|
issue #2430:move GLProgram enum into class
|
2013-07-25 17:48:22 +08:00 |
James Chen
|
1e00a0a6bf
|
Merge pull request #3241 from minggo/releasing
fix some errors for template
|
2013-07-25 02:25:09 -07:00 |
minggo
|
8a2baff4a0
|
Merge pull request #12 from dumganhar/minggo-releasing
[Android] Fixing path error and reducing dependence for extension.
|
2013-07-25 02:03:33 -07:00 |
James Chen
|
25beed0051
|
[Android] Fixing path error and reducing dependence for extension.
|
2013-07-25 16:53:35 +08:00 |
zhangbin
|
75f5c49a64
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-07-25 16:07:32 +08:00 |
zhangbin
|
dd6ed6e6a8
|
closed #2356
1. Modify the JS binding of interface ProtocolAds::showAds.
2. Update the JS binding for plugin.
|
2013-07-25 16:07:09 +08:00 |
James Chen
|
653c1f7f8f
|
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
|
2013-07-25 16:00:45 +08:00 |
James Chen
|
c1a8916dd6
|
Merge pull request #3249 from dumganhar/iss2404-ext-deprecated
Deprecated warning fixes.
|
2013-07-25 00:49:47 -07:00 |
James Chen
|
90fbcec9c5
|
issue #2404: Reverting cocos2dx/proj.linux/cocos2dx.mk, ignoring deprecated methods since linux build will treat warning as errors.
|
2013-07-25 15:32:46 +08:00 |
James Chen
|
aaf5bcef52
|
issue #2404: Invocation of some deprecated methods fixes.
|
2013-07-25 15:25:11 +08:00 |
minggo
|
3d6f3bf8b2
|
issue #2430:move ProgressTimer enum into class
|
2013-07-25 15:11:36 +08:00 |
James Chen
|
6a0a4ed0f9
|
#issue #2404: Using Texture2D::getDefaultAlphaPixelFormat instead of Texture2D::defaultAlphaPixelFormat in TextureCache.
|
2013-07-25 15:05:56 +08:00 |
James Chen
|
f8392adce2
|
issue #2404: Open deprecated warning for Android and Linux.
|
2013-07-25 15:05:56 +08:00 |
James Chen
|
387ea1899c
|
issue #2404: Disabling warning of invoking deprecated methods in engine. Rename CCCallFuncND to __CCCallFuncND, and add deprecated typedef CCCallFuncND.
Only disable warning for CCActionInstant.cpp and CCMenuItem.cpp
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (push)
#pragma warning (disable: 4996)
#endif
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (pop)
#endif
|
2013-07-25 15:05:56 +08:00 |
minggo
|
658bffbb69
|
issue #2430:use upper letter for enum item in ccGLStateCache.h
|
2013-07-25 15:04:13 +08:00 |
minggo
|
08b13e9867
|
issue #2430:move Configuration enum into class
|
2013-07-25 14:47:12 +08:00 |
minggo
|
8dab462f6f
|
issue #2430:move Director enum into class
|
2013-07-25 14:39:32 +08:00 |
minggo
|
edcea3eb8d
|
issue #2430:move more Particle enum into class
|
2013-07-25 14:27:46 +08:00 |
minggo
|
4519a09ce4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
|
2013-07-25 13:54:55 +08:00 |
minggo
|
4bfe6c2439
|
issue #2430:move Particle enum into class
|
2013-07-25 13:54:32 +08:00 |
minggo
|
991aa570bd
|
Merge pull request #3242 from dumganhar/iss2404-ext-deprecated
Deprecated methods and macros in extensions.
|
2013-07-24 22:51:14 -07:00 |
James Chen
|
6c3878fc45
|
issue #2404: Fixing a warning in ccTypes.h.
|
2013-07-25 13:45:41 +08:00 |
James Chen
|
af3b8a0390
|
issue #2404: Rename CallFuncND/CallFuncO to CCCallFuncND/CCCallFuncO and mark them as deprecated classes. In v3.0, we could use CallFuncN instead.
|
2013-07-25 13:45:02 +08:00 |
minggo
|
0175cf0538
|
Merge pull request #3246 from natural-law/develop
Resolve the bug in plugin 360 & uc
|
2013-07-24 22:43:00 -07:00 |
James Chen
|
f16a64cf4a
|
issue #2404: Compilation error fixes.
|
2013-07-25 11:56:09 +08:00 |
James Chen
|
306587167d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated
Conflicts:
AUTHORS
|
2013-07-25 11:28:48 +08:00 |
James Chen
|
fa3d125c4b
|
issue #2404: Adding CCDeprecated-ext.h to iOS/Mac projects.
|
2013-07-25 10:45:54 +08:00 |
James Chen
|
99a750f7b2
|
Merge branch 'iss2404-ext-deprecated' of https://github.com/dumganhar/cocos2d-x into iss2404-ext-deprecated
|
2013-07-25 10:33:51 +08:00 |