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

159 Commits

Author SHA1 Message Date
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
zhangbin 16d8cc9ec0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj
 2013-06-09 13:58:09 +08:00
zhangbin d9b42ccc67 Add plugin twitter for iOS. 2013-06-09 13:44:03 +08:00
James Chen 3e3932077a Merge pull request #2782 from natural-law/develop 
Update the flurry SDK version.
 2013-06-06 00:10:16 -07:00
James Chen fa1e6e35b9 Merge pull request #2781 from natural-law/master 
Update the flurry SDK version.
 2013-06-06 00:09:54 -07:00
James Chen d32eaedd59 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 
Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
 2013-06-06 15:05:54 +08:00
James Chen f22d320797 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 2013-06-06 14:24:58 +08:00
zhangbin 9e7765477b Update the flurry SDK version. 2013-06-06 11:28:45 +08:00
zhangbin 5b43951e8c Update the flurry SDK version. 2013-06-06 11:21:45 +08:00
zhangbin 457942f05b Update the license in the sample code. 2013-06-05 11:19:54 +08:00
zhangbin f26530748a Update the license in the sample code. 2013-06-05 11:19:17 +08:00
zhangbin 828158d009 Update the JS binding code of plugin. 2013-06-05 10:30:44 +08:00
zhangbin b2ef2ac916 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-05 10:30:44 +08:00
zhangbin 7b00055d9e issue #2254 : Add plugin weibo for iOS. 2013-06-05 10:30:43 +08:00
zhangbin aa94056b5a Update the JS binding code of plugin. 2013-06-05 10:25:19 +08:00
zhangbin 17d0ea1c09 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-04 18:32:42 +08:00
zhangbin 65dfb60442 issue #2254 : Add plugin weibo for iOS. 2013-06-04 18:31:42 +08:00
zhangbin 46d83f057f Add support for C++ 11in samples 2013-06-04 11:49:46 +08:00
zhangbin d83c9b58a5 Merge branch 'ForReflection' 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-06-04 10:12:41 +08:00
zhangbin 1eb8217edb fixed #2224 : Update the JS binding code for plugin. 2013-06-04 10:06:16 +08:00
zhangbin ba6e952668 Merge branch 'ForReflection' 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-05-30 15:44:11 +08:00
zhangbin 01ca1805e8 issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework. 2013-05-30 14:57:39 +08:00
zhangbin 50747530e0 issue #2224 : Implement reflection in plugin on iOS. 2013-05-30 14:50:21 +08:00
zhangbin a6346a8036 issue #2224 : Use variable argument functions in the implementation of reflection. 2013-05-29 14:22:08 +08:00
zhangbin 4022e002e8 issue #2224 : Modify the implementation of plugin flurry & umeng. 2013-05-28 18:10:09 +08:00
zhangbin c5965989b0 issue #2224 : Modify the implementation of plugin admob. 2013-05-27 14:40:08 +08:00
zhangbin 35bc7a51d8 issue #2224 : Modify the implementation of plugin alipay & nd91. 2013-05-27 14:19:36 +08:00
zhangbin 9f61f92017 issue #2224 : Modify the implementation of plugin twitter & weibo on android for the new framework of plugin. 2013-05-27 13:58:31 +08:00
zhangbin c89bf0f1a8 Refactor the implementation of plugin protocols on android. 2013-05-24 17:34:01 +08:00
Lu Guanqun aeb1e53026 remove the un-used static variable in PluginUtilsIOS 2013-05-24 03:54:07 +08:00
zhangbin 514f7fe5d5 Add reflection in plugin on android. 2013-05-23 17:57:55 +08:00
zhangbin 79bd3c990e fixed #2155 : Resolve the bug of callback methods in plugin. 2013-05-16 11:45:46 +08:00
zhangbin 5a9db1a8da Request developer input the app key of weibo account in demo code. 2013-05-14 18:33:05 +08:00
zhangbin e167862406 Remove the unused code in weibo. 2013-05-14 17:00:36 +08:00
zhangbin 19b05bb9e0 Add plugin weibo & demo code in HelloSocial. 2013-05-14 13:49:19 +08:00
zhangbin 3ce52e56aa Refactor the framework of plugin on iOS. 2013-05-10 13:54:11 +08:00
minggo 2cadc5784b use portrait mode and adjust spaces between labels for umeng xcode project 2013-04-28 16:04:41 +08:00
natural-law 325faa4736 Update the umeng SDK to new version(for iOS) 2013-04-28 13:58:26 +08:00
zhangbin a38ea6792b Update the umeng SDK to new version. 2013-04-28 10:30:20 +08:00
zhangbin 1db8ecd8e4 Update the iOS projects of plugin. 2013-04-27 17:29:20 +08:00
zhangbin 4db988f51d Change the package name of project HelloIAP-JS. 2013-04-27 13:47:27 +08:00
zhangbin e2c3d33a77 Update the JS bindings for plugin. 2013-04-27 11:32:12 +08:00
zhangbin 7ccd6f5c9a Add licenses in source code files of HelloAds. 2013-04-26 17:18:17 +08:00
zhangbin 81e1f5c4c7 Optimize the interfaces design in ProtocolAds. 2013-04-26 17:16:06 +08:00
zhangbin 0b08d88f27 Optimize the interface & type names in plugin. 2013-04-26 17:12:51 +08:00
zhangbin 73f0b6df04 Add licenses in source code files. 2013-04-25 20:43:58 +08:00
zhangbin 2b5238c64b 1. Change the implementation of callback in Social plugins. 
2. Add licenses in source code files.
 2013-04-25 18:25:48 +08:00
zhangbin 4611027d47 1. Change the implementation of callback in IAP plugins. 
2. Add licenses in source code files.
 2013-04-25 17:33:42 +08:00
zhangbin f30aaed426 Modify the permission of plugin twitter. 2013-04-24 17:23:35 +08:00
zhangbin f7e07188b2 Adjust the implementation of ProtocolSocial & plugin twitter. 2013-04-24 16:53:02 +08:00
lihex 661977645e Add HelloSocial sample 2013-04-24 16:00:36 +08:00
lihex ae7dab15b6 Submit twitter share plugin implement 2013-04-24 15:59:54 +08:00
lihex 4e24ce40ea Submit protocol of social share plugin 2013-04-24 15:58:57 +08:00
zhangbin 8d60e11a9f Update the JS binding for plugin 2013-04-24 09:43:40 +08:00
zhangbin 42ca70937f Update the iOS projects in plugin, and remove the win32 projects. 2013-04-22 17:11:45 +08:00
zhangbin abd6f3c906 Add sample code HelloAds for android platform 2013-04-22 11:17:31 +08:00
zhangbin 6a48e8145d Add plugin admob for android platform. 2013-04-22 10:40:29 +08:00
zhangbin 79870ded6a Add ads protocol. 2013-04-22 10:38:14 +08:00
zhangbin 46b9090241 Solve the bug in ant build. 2013-04-19 16:20:40 +08:00
zhangbin 78c1cb809e Add the base sample code for ads 2013-04-19 16:19:04 +08:00
zhangbin d762283c9b Resolve the ndk build error. 2013-04-16 14:51:32 +08:00
zhangbin 75557bbe7b Remove the protocol IAP Online 2013-04-16 14:41:35 +08:00
zhangbin 2d82c05547 issue #1471 : Resolve the encoding bug in modifyAppMk.sh 2013-04-10 11:54:25 +08:00
James Chen 90ad5410c7 [PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx. 2013-04-09 14:46:49 +08:00