samuele3hu
|
38a23890ff
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop
|
2013-07-30 09:55:28 +08:00 |
samuele3hu
|
3499aafd27
|
issue #2435:Lua template supports mac port
|
2013-07-30 09:51:15 +08:00 |
James Chen
|
5aab0cab7b
|
[Android] Fixing build errors for ndk-r9.
|
2013-07-29 14:54:00 +08:00 |
samuele3hu
|
3c953a934e
|
issue #2404:Add more deprecated function and Modify template vs11 solution
|
2013-07-28 00:16:16 +08:00 |
minggo
|
b6b56a252c
|
make iOS template work ok on armv7s devices
build only active architecture only
|
2013-07-27 21:20:25 +08:00 |
James Chen
|
8721951cee
|
Lua Template Fix.
|
2013-07-27 15:16:09 +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 |
minggo
|
5479dbe0b9
|
remove xcode template
|
2013-07-26 10:54:20 +08:00 |
minggo
|
7f3627ea00
|
remove android template
|
2013-07-26 10:52:39 +08:00 |
James Chen
|
a1c3631962
|
issue #2404: DrawPrimitives deprecated.
|
2013-07-25 22:38:55 +08:00 |
minggo
|
99949331b1
|
fix error and compilings error in templates
|
2013-07-24 17:27:29 +08:00 |
minggo
|
f6cfe3007f
|
issue #2412:fix merging conflict
|
2013-07-23 10:41:11 +08:00 |
James Chen
|
1db847ad7c
|
issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
|
2013-07-22 17:24:54 +08:00 |
minggo
|
687c088b51
|
issue #2412:remove blackberry and marmalade port because they don't support c++11
|
2013-07-19 13:55:03 +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
|
33c37f5f9d
|
issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
|
2013-07-12 14:44:24 +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
|
a678d12615
|
issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
|
2013-07-12 12:03:39 +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 |
James Chen
|
cd2fae36f1
|
issue #2371: Updating multi-platform-template for iOS and Mac
|
2013-07-05 10:31:20 +08:00 |
Keiran Tai
|
dde6250159
|
Regenerated xcode4 templates plist files due to missing few important files and causes compile error
|
2013-07-04 11:13:15 +08:00 |
folecr
|
6708983de2
|
Update target to android-10 for NDK code
|
2013-06-24 15:14:14 -07:00 |
folecr
|
7d4ce91b6b
|
Up the minSdkVersion to 9
|
2013-06-24 15:14:14 -07:00 |
James Chen
|
80cb06d3f7
|
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
|
2013-06-24 10:01:57 +08:00 |
James Chen
|
53a372669a
|
closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation.
|
2013-06-23 17:25:34 +08:00 |
James Chen
|
88a0dbec5e
|
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
|
2013-06-21 21:29:25 +08:00 |
minggo
|
0a768da240
|
issue #2305: use 4.7 toolchain to fix compiling errors
|
2013-06-21 17:17:23 +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 |
loong0
|
1e6d5da5ac
|
merge the conflict copy_files.sh
|
2013-06-21 07:24:01 +08:00 |
James Chen
|
d1bd34fd08
|
issue #2129: Removing CC prefix for template.
|
2013-06-20 22:18:43 +08:00 |
loong0
|
202c44a108
|
not copy the java lib
|
2013-06-19 23:40:36 +08:00 |
James Chen
|
247dcb7a4c
|
[win32] multi-platform-xxx template only support vs2012 now.
|
2013-06-19 15:23:09 +08:00 |
James Chen
|
74e9be0a85
|
Removing blackberry template, please use tools/project-creator instead.
|
2013-06-19 15:23:09 +08:00 |
James Chen
|
2c0cc603d1
|
Merge branch 'master' into develop
Conflicts:
extensions/cocos-ext.h
|
2013-06-18 10:46:25 +08:00 |
James Chen
|
a828d5f1a6
|
[Windows] multi-platform-lua fix.
|
2013-06-17 15:55:37 +08:00 |
James Chen
|
ccb67cbcb4
|
Template fix for iOS Template.
|
2013-06-17 15:54:12 +08:00 |
loong0
|
c1137c991d
|
debug script modified
|
2013-06-16 19:25:20 +08:00 |
loong0
|
a69d8ee43e
|
add copying of the java library
|
2013-06-15 14:20:43 +08:00 |
James Chen
|
c0d44cb2e4
|
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
|
2013-06-15 14:03:30 +08:00 |
minggo
|
cd5bcb87af
|
issue #2284: merge master and fixed some conflicts
|
2013-06-13 17:54:05 +08:00 |
minggo
|
e8fb1f4da0
|
copy lua script when creating a project by create-android-project.sh
|
2013-06-10 22:35:05 +08:00 |
James Chen
|
be0efac2d7
|
[Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj.
|
2013-06-10 14:57:18 +08:00 |
James Chen
|
b9e0be8d10
|
[Template] Updating multi-platform-lua/proj.marmalade/HelloLua.mkb.
|
2013-06-10 14:55:26 +08:00 |
James Chen
|
1e527c1d52
|
[Template] Updating iOS template project of multi-platform-lua. Using AudioEngine module.
|
2013-06-10 14:20:53 +08:00 |