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

122 Commits

Author SHA1 Message Date
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
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
Peter Young cedfd6bbdc [plugin-x][Umeng] fix not sending Event when paramMap is nil 2013-07-01 16:51:31 +08:00
zhangbin c790d8de9b issue #2336, Modify the compiler of plugins project on ios. 2013-06-28 15:21:39 +08:00
zhangbin 71f9023cc4 issue #2336, Remove the unused sample projects in plugin. 2013-06-28 11:48:24 +08:00
zhangbin 530afbb9d9 issue #2336, Add a sample project with all plugins. 2013-06-28 11:46:39 +08:00
zhangbin 3c060fbcd8 closed #2334, Add user login & logout functions in plugin nd91. 2013-06-27 10:57:13 +08:00
zhangbin d8e9e2ef1c issue #2334, Update the SDK of ND91 to newest version. 2013-06-26 15:52:42 +08:00
zhangbin 9205880135 Modify the target version of plugin samples to android-10. 2013-06-26 14:37:24 +08:00
zhangbin f0d1df426f Modify the min sdk version of android platform required in plugin samples. 2013-06-26 14:14:40 +08:00
zhangbin f8a22bb134 closed #2317, Add sample project HelloUser. 2013-06-25 18:05:03 +08:00
zhangbin 1a6bfc0bf6 issue #2317, Add plugin qh360 . 2013-06-25 18:03:04 +08:00
zhangbin 5d4db95fed issue #2317, Adjust ProtocolUser for actual situation. 2013-06-25 18:00:50 +08:00
zhangbin 81f0c2b2bd Merge branch 'develop' into ForUser 2013-06-24 17:02:45 +08:00
zhangbin c72cdcb88e Update the JS binding for plugin. 2013-06-24 17:00:02 +08:00
zhangbin c20a067799 Merge branch 'develop' into ForUser 
Conflicts:
	plugin/protocols/platform/android/PluginFactory.cpp
	plugin/protocols/proj.android/jni/Android.mk
 2013-06-24 14:52:06 +08:00
zhangbin 622f1e7a4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-24 14:31:06 +08:00
zhangbin 79e2819107 Rename the class ProtocolSocial to ProtocolShare. 2013-06-24 14:30:38 +08:00
zhangbin b9a1dd3d19 Add ProtocolUser for custom system plugins. 2013-06-24 11:31:10 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
zhangbin 5ad116328f Update the JS binding of plugin. 2013-06-21 09:43:28 +08:00
James Chen 6d60a77622 issue #2129: Renaming variables. 2013-06-20 16:31:12 +08:00
James Chen c2f0bcf167 issue #2129: Warning fix in PluginUtils.h 2013-06-20 16:28:20 +08:00
James Chen f3d08a8b4e issue #2129: Renaming member variables for plugin, m_XXX --> _XXX. 2013-06-20 16:27:50 +08:00
James Chen e280815cfe issue #2129: Removing CC prefix for plugin module. 2013-06-20 16:02:39 +08:00
zhangbin 776efaf458 Adjust ProtocolAds for more Ads plugins. 2013-06-19 16:41:15 +08:00
zhangbin 7939c3d73f Add advertisement type for more Ads plugins. 2013-06-18 15:53:56 +08:00
zhangbin b0b24e09c5 Add sample code for plugin admob on iOS. 2013-06-18 10:36:23 +08:00
zhangbin 6da209331f Add plugin Admob for iOS. 2013-06-18 10:35:19 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 328282f88f CCScriptEngineManager::sharedManager()->purgeSharedManager(); --> CCScriptEngineManager::purgeSharedManager(); 2013-06-10 11:54:23 +08:00
zhangbin 3795175812 Delete the developer ID in project config. 2013-06-09 18:17:37 +08:00
zhangbin 484f51fbbc Modify the license of plugin twitter. 2013-06-09 18:01:11 +08:00
zhangbin a2c059f0ed Resolve the bug in the reflection of plugin. 2013-06-09 18:00:56 +08:00
zhangbin 2a241ad517 Add C++ 11 support for iOS projects. 2013-06-09 17:57:27 +08:00
zhangbin e994321a61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj
 2013-06-09 17:30:37 +08:00
zhangbin e2ac14a235 Add plugin twitter for iOS. 2013-06-09 17:27:47 +08:00
zhangbin 107cf66039 Resolve the bug in the reflection of plugin. 2013-06-09 17:20:05 +08:00
zhangbin a931f2230e Modify the license of plugin twitter. 2013-06-09 14:09:46 +08:00