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

47 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 1eb8217edb fixed #2224 : Update the JS binding code for plugin. 2013-06-04 10:06:16 +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 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 5a9db1a8da Request developer input the app key of weibo account in demo code. 2013-05-14 18:33:05 +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
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
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 78c1cb809e Add the base sample code for ads 2013-04-19 16:19:04 +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
zhangbin 5201723b0f Optimize the sample code of HelloIAP. 2013-04-08 17:32:58 +08:00
zhangbin 6b69b57c72 Add sample code for using plugin by JS script. 2013-04-08 11:58:52 +08:00
zhangbin 49096ce98e Submit the sample code HelloIIAP. 2013-04-07 17:07:33 +08:00
zhangbin d012d5513a Add plugin code into cocos2d-x engine. 2013-04-07 16:58:26 +08:00