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

159 Commits

Author SHA1 Message Date
zhangbin ca594eedac Optimize the ant configuration for plugins 2013-08-16 11:44:17 +08:00
zhangbin 505f156972 Update the SDK of plugin qh360 2013-08-13 15:12:38 +08:00
zhangbin 54dbc93caf Invoke methods of Flurry SDK on UI thread in plugin flurry. 2013-08-01 15:05:57 +08:00
zhangbin 0f8e1d930a closed #2439, Add sample code for plugin flurry Ads. 2013-07-30 14:57:37 +08:00
zhangbin e187be3942 issue #2439, Add flurry ads plugin for android. 2013-07-30 14:56:45 +08:00
zhangbin 4a3ee3b9a1 issue #2439, Add flurry ads plugin for iOS. 2013-07-29 18:15:21 +08:00
zhangbin a632a830c1 Move the developer informations to file Configs.h 2013-07-29 18:06:22 +08:00
zhangbin 679515f9df Remove the deprecated methods. 2013-07-29 15:17:54 +08:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
zhangbin ce444a57f3 Update the JS binding code of plugin. 2013-07-29 11:27:47 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00
James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 19:56:04 +08:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
zhangbin f847bf4757 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-26 16:11:11 +08:00
zhangbin 4ea5d0509f Update the JS binding for the change of class ProtocolAds. 2013-07-26 16:07:30 +08:00
zhangbin bbe649812a Update class ProtocolAds to compatible with more Ads SDKs. 2013-07-26 15:51:06 +08:00
James Chen 7839f769f2 Merge pull request #3265 from dumganhar/constants_fixes 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
 2013-07-25 23:21:29 -07:00
James Chen d345ac7f3f [Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache(); 2013-07-26 14:00:10 +08:00
James Chen 43f9ebafac Merge pull request #3262 from natural-law/develop 
[ci skip]Update the JS binding for plugin.
 2013-07-25 18:41:07 -07:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +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
zhangbin b9eacf8517 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-25 10:20:56 +08:00
zhangbin ed5c1afaf6 Resolve the bug in plugin qh360 2013-07-24 18:23:21 +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
James Chen 35dec5d71e More CCLog --> log. 2013-07-24 10:46:13 +08:00
zhangbin a4ed92ddaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-23 14:29:36 +08:00
zhangbin 9edc1dff80 closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins. 2013-07-23 14:29:11 +08:00
zhangbin e35d06ae26 issue #2416, Add ProtocolSocial for iOS platform. 2013-07-23 14:26:11 +08:00
zhangbin b9bee5103f issue #2416, Add ProtocolSocial for android platform. 2013-07-23 13:45:23 +08:00
James Chen 1db847ad7c issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
zhangbin ff29d08c4b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-19 10:07:42 +08:00
zhangbin 8a82b4b87a Rename the library file name of uc SDK. 2013-07-19 10:06:28 +08:00
James Chen 56419b9e90 issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 
Reset the order of reloading shaders and textures in main.cpp.
 2013-07-17 12:53:30 +08:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 1f8e852020 issue #2397: Shader::sharedShaderCache() --> Shader::getInstance(). 2013-07-12 13:40:01 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
zhangbin ae9dbd26ce issue #2390, Resolve the bug in file plugin/tools/toolsForGame/modifyClassPath.py. 2013-07-10 16:21:16 +08:00
zhangbin 54995745cf closed #2390, Resolve the bug plugin/tools/config.sh. 2013-07-10 15:34:29 +08:00
zhangbin 571aeaed7e closed #2390, Resolve the bug in modify game projects tools. 2013-07-10 10:40:42 +08:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
zhangbin 7e015867ad closed #2330, Support more ABI types in plugin. 2013-07-05 17:26:07 +08:00
zhangbin 2bdf55d78d Add workspace for iOS projects of plugin-x. 2013-07-05 11:42:01 +08:00
zhangbin e999cc9541 closed #2376, Add online IAP feature in plugins : uc, nd91 & qh360. 2013-07-05 10:51:08 +08:00
zhangbin 849276d0f3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-02 10:58:44 +08:00
zhangbin 5b1d5e0d3e closed #2349, Add user login/logout plugin UC. 2013-07-02 10:51:01 +08:00