Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,838 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

10838 Commits

Author SHA1 Message Date
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
James Chen 477dd6c3c7 issue #2404: cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now. 2013-07-25 10:33:19 +08:00
zhangbin b9eacf8517 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-25 10:20:56 +08:00
minggo a13a46e54f Merge pull request #3243 from azmeuk/emscripten-package 
Use of a single emscripten HTML template file
 2013-07-24 18:36:28 -07:00
minggo a55982cbfe Merge pull request #3245 from ricardoquesada/fixes_warnings 
Fixes some warnings
 2013-07-24 18:25:33 -07:00
Ricardo Quesada 943b805bc8 Fixes some warnings 
... and updates the version to pre-alpha0
 2013-07-24 14:02:36 -07:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
minggo 439ed140cd assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION 2013-07-24 18:35:26 +08:00
zhangbin ed5c1afaf6 Resolve the bug in plugin qh360 2013-07-24 18:23:21 +08:00
James Chen e0f9ac82da issue #2404: Updating ExtensionsTest/CocosBuilderTest. 2013-07-24 18:17:20 +08:00
James Chen 762b987ae7 issue #2404: [Extensions] Updating the file for deprecated methods. 2013-07-24 18:00:40 +08:00
James Chen fb1b510557 issue #2404: Deprecated some methods in NodeLoaderLibrary.h/.cpp. 2013-07-24 18:00:02 +08:00
James Chen 00999b464e issue #2404: Reverting callback interface for CCBReader. 2013-07-24 17:59:21 +08:00
James Chen e5c2ad0cb8 issue #2404: Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated. 2013-07-24 17:54:17 +08:00
James Chen d42ff355b6 issue #2404: Mark RenderTexture:: newCCImage as deprecated. 2013-07-24 17:53:34 +08:00
James Chen 7fd0a923e9 issue #2404: Updating CCDeprecated.h, CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent; 2013-07-24 17:52:00 +08:00
minggo a76863dd7f add execution permission 2013-07-24 17:50:39 +08:00
minggo 99949331b1 fix error and compilings error in templates 2013-07-24 17:27:29 +08:00
minggo 019246fd51 travis build template too 2013-07-24 17:26:45 +08:00
minggo 9aa45b856f remove blackberry and marmalade port 2013-07-24 17:25:56 +08:00
James Chen debd1965c9 Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	cocos2dx/include/CCDeprecated.h
 2013-07-24 16:53:14 +08:00
James Chen 44a338f63c issue #2404: Re-add CallFuncND and CallFuncO and mark them as deprecated class. 2013-07-24 16:45:11 +08:00
zhangbin 9944a5d186 Rename the singleton methods name in sample project of plugin. 
Remove the deprecated methods.
 2013-07-24 15:31:20 +08:00
zhangbin a718f8ba81 Resolve the bug : login UI of 360 & UC can't be landscape. 2013-07-24 15:29:54 +08:00
minggo ff0cbb9d0b Merge pull request #3232 from samuele3hu/TestSample 
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
 2013-07-23 23:33:28 -07:00
minggo 9b3f4a604b [ci skip] 2013-07-24 12:04:59 +08:00
samuele3hu bf692c8fde issue #2426:Modify tab and spaces 2013-07-24 12:03:54 +08:00
James Chen a2ba2e3f87 Merge pull request #3236 from dumganhar/iss2427-js-parse-plist 
closed 2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
 2013-07-23 20:56:30 -07:00