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
|
bbe649812a
|
Update class ProtocolAds to compatible with more Ads SDKs.
|
2013-07-26 15:51:06 +08:00 |
James Chen
|
d345ac7f3f
|
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
|
2013-07-26 14:00:10 +08:00 |
James Chen
|
a1c3631962
|
issue #2404: DrawPrimitives deprecated.
|
2013-07-25 22:38:55 +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
|
9944a5d186
|
Rename the singleton methods name in sample project of plugin.
Remove the deprecated methods.
|
2013-07-24 15:31:20 +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 |
James Chen
|
1db847ad7c
|
issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
|
2013-07-22 17:24:54 +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 |
Jaroslaw Lewandowski
|
626ba2686f
|
Solving 'black screen' on android
|
2013-07-09 21:21:43 +01: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
|
5b1d5e0d3e
|
closed #2349, Add user login/logout plugin UC.
|
2013-07-02 10:51:01 +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
|
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
|
5d4db95fed
|
issue #2317, Adjust ProtocolUser for actual situation.
|
2013-06-25 18:00:50 +08:00 |
zhangbin
|
c72cdcb88e
|
Update the JS binding for plugin.
|
2013-06-24 17:00:02 +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 |
James Chen
|
0879a12516
|
issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects.
|
2013-06-21 11:14:03 +08:00 |
James Chen
|
6d60a77622
|
issue #2129: Renaming variables.
|
2013-06-20 16:31:12 +08:00 |
James Chen
|
e280815cfe
|
issue #2129: Removing CC prefix for plugin module.
|
2013-06-20 16:02:39 +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 |
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 |