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
James Chen
47b2a65faf
[Template] Updating iOS template project of multi-platform-cpp.
2013-06-10 14:18:24 +08:00
James Chen
cd40b42761
[Android] Updating multi-platform-lua/proj.android/.project
2013-06-10 13:19:16 +08:00
James Chen
6986acf8a4
[Win32] Deleting vs template, please use 'tools/project-creator' to create multi-platform project instead.
2013-06-10 12:26:54 +08:00
James Chen
328282f88f
CCScriptEngineManager::sharedManager()->purgeSharedManager(); --> CCScriptEngineManager::purgeSharedManager();
2013-06-10 11:54:23 +08:00
minggo
bd660e708d
issue #2103 : copy lua script in lua multi-platform project
2013-06-09 11:39:18 +08:00
minggo
0e66dc8712
issue #2103 : add lua files for lua multi-template project
2013-06-09 11:06:30 +08:00
James Chen
7c650d7f28
[BB] Updating project configuration.
2013-06-07 18:45:58 +08:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
James Chen
ec8ab8bd8b
Updating multi-platform-xxx template for win32.
2013-06-07 12:57:28 +08:00
James Chen
d72e9d10b5
Updating multi-platform-xxx template for win32.
2013-06-07 12:50:02 +08:00
James Chen
d5bbcce165
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:09:44 +08:00
James Chen
6f52d72b82
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:07:11 +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
minggo
d71e07db4e
fixed conflict
2013-06-05 13:48:31 +08:00
minggo
b0937a5a2d
issue #2257:change copyright of template
2013-06-05 11:25:39 +08:00
minggo
6491ff75cf
issue #2257 : make ios template work
2013-06-05 11:21:04 +08:00
loong0
c23267834b
smarter script for creating android project
2013-06-04 22:21:41 +08:00
James Chen
bb635c280c
Updating multi-platform-xxx template for iOS and Android after enabling c++ 11.
2013-06-04 20:52:29 +08:00
James Chen
b88a222fc5
Updating multi-platform-xxx template for iOS and Mac.
2013-06-04 20:37:24 +08:00
James Chen
3b673547cc
Updating multi-platform-xxx template for iOS and Mac.
2013-06-04 19:49:03 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
James Chen
d402b349e2
issue #2092 : Updating win32 project configuration.
2013-05-20 21:12:25 +08:00
James Chen
f6297aeb33
Updating iOS template.
2013-05-20 21:06:37 +08:00
James Chen
78000c70fc
[iOS] Template fix.
2013-05-19 18:12:14 +08:00
James Chen
3ce8de8904
[BB]Adding COCOS2D_DEBUG=1 .
2013-04-27 15:17:18 +08:00
James Chen
7f128cfd11
[BB] Updating project configuration of multi-platform-lua.
2013-04-27 15:16:29 +08:00
James Chen
02afbaaa53
Fixing errors in multi-platform-lua for BB.
2013-04-27 15:08:28 +08:00
James Chen
cf53d264f9
[Blackberry] Adding .gitkeep, updating bb project for multi-platform-lua
2013-04-27 15:04:55 +08:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
James Chen
ec3d870231
[Linux]Updating template of multi-platform-cpp
2013-04-27 11:18:09 +08:00
minggo
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
James Chen
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
James Chen
2c69ce8d80
fixed #2075 : Updating multi-platform template project settings.
2013-04-24 15:56:37 +08:00
James Chen
f129b94e2d
Removing unused file(uthash.h) in JSB projects.
2013-04-19 11:09:02 +08:00
minggo
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
James Chen
c311085dea
issue #1847 : Updating multi-platform-lua/proj.ios/HelloLua.xcodeproj.
2013-04-17 10:00:56 +08:00
James Chen
79d58bcdb9
issue #1847 : Adding sources of Luajit2.0.1-hotfix, and adding android support.
2013-04-16 17:34:58 +08:00
James Chen
854944c272
Updating iOS template.
2013-04-09 15:30:37 +08:00
billy1380
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
fape
9c6a65d898
Update template android projects README files
2013-03-21 19:06:58 +01:00
minggo
ae9675c3bd
fix some bugs when creating android project with multi-platform tool
2013-03-21 06:20:19 +08:00
minggo
2430f28ea1
Merge https://github.com/dumganhar/cocos2d-x into test-damganhar
2013-03-21 05:33:17 +08:00
James Chen
daea6ed3ea
Removing unused codes.
2013-03-20 23:19:55 +08:00
James Chen
3f43456072
Updating multi-platform templates.
2013-03-20 23:18:41 +08:00
James Chen
f7d3a23a98
Updating the template of multi-platform-js for win32.
2013-03-20 22:45:41 +08:00
minggo
666279e30d
don't modify .project file when creating a new android project
2013-03-20 20:54:31 +08:00
James Chen
6a98553633
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
2013-03-18 18:24:37 +08:00
minggo
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
James Chen
ae1c64573e
Merge pull request #2046 from rohankuruvilla/eclipse
...
fixed #1827 : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
James Chen
32a8eb45f4
Updating the template of muti-platform-js.
2013-03-11 22:44:10 +08:00
Sam Clegg
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
Rohan Kuruvilla
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
minggo
3cb4ab8f31
issue #1529:update xcode template
2013-03-07 10:41:45 +08:00
Rohan Kuruvilla
297f46c69e
Adding README files to project creation template
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4e7c0a8213
Adding updated .project file in templates
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
8035562dfa
Adding Eclipse Project files in template directory for new Javascript projects
2013-03-04 11:50:38 -08:00
Rohan Kuruvilla
53be6102f4
Adding Eclipse Project files for C++ projects
2013-03-04 11:50:38 -08:00
Nika Mamulashvili
1cabb1c9cd
Corrected Missing ccUTF8.h & ccUTF8.cpp File Links
2013-02-28 17:00:22 +04:00
James Chen
831ec120ff
Merge pull request #2033 from xyhl515/master
...
fixed #1746 : Added VS2012 Express template installing support.
2013-02-24 18:13:28 -08:00
walzer
37779a2e1a
don't need to remove assets/Images/test_*.pvr.gz files in multi-platform-cpp template
2013-02-24 16:15:05 +08:00
xyhl515
1eed0b5663
Add VS2012 Express For Windows Desktop support in install-templiates-msvc.bat
2013-02-23 21:21:58 +08:00
James Chen
7f7f44c05c
issue #1733 : Updated template/multi-platform-lua/proj.win32/HelloLua.sln.
2013-02-21 17:53:01 +08:00
James Chen
98f5ac3d0b
Merge pull request #2020 from walzer/project-creator
...
tools/project-creator works for lua and cpp templates.
2013-02-21 01:50:37 -08:00
James Chen
bd060f2a22
issue #1733 : Updated multi-platform-lua/proj.android/build_native.sh.
2013-02-21 17:23:43 +08:00
walzer
3eab5d509b
issue #1733 , project-creator for lua works.
2013-02-21 17:11:11 +08:00
walzer
d736f38fac
issue #1733 , project-creator for cpp project seems ok
2013-02-21 16:51:22 +08:00
James Chen
a9f030e913
issue #1733 : Adding HelloLua.win32.sln.
2013-02-20 15:19:42 +08:00
James Chen
532cbe2466
issue #1733 : Updated the template of hybrid lua project for win32.
2013-02-20 15:11:30 +08:00
James Chen
212d445b40
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid
2013-02-20 14:32:20 +08:00
James Chen
4da388a2b6
issue #1733 : Updated template projects. Using the same package name on iOS as which on Android.
...
On iOS, org.cocos2d-x.HelloCpp -> org.cocos2dx.hellocpp.
2013-02-20 14:30:05 +08:00
James Chen
fb23323e55
issue #1733 : Renamed testlua to hellolua.
2013-02-20 13:54:07 +08:00
James Chen
5b16c3d499
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid
2013-02-20 13:42:02 +08:00
James Chen
9cc4b7ab29
fixed a bug of respond touch events in hello.lua. The event type is string now.
2013-02-20 12:03:21 +08:00
James Chen
d3e0aa176b
issue #1733 : Updated hybrid lua template project.
2013-02-20 12:01:47 +08:00
James Chen
a2e0903b74
issue #1733 : Updated cpp hybrid template project.
2013-02-20 10:20:06 +08:00
James Chen
79f097892a
issue #1733 : Adding multi-platform-cpp/proj.win32/HelloCpp.sln
2013-02-20 10:17:50 +08:00
James Chen
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
James Chen
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
James Chen
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
James Chen
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
James Chen
a54edec0e3
issue #1733 : Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.
2013-02-19 15:38:30 +08:00
James Chen
96c91390cc
issue #1724 : Adding solution for HelloJavascript.
2013-02-19 10:51:55 +08:00
James Chen
9931bc6eaf
fixed #1724 : Renamed libhellojavascript to libcocos2djs.
2013-02-18 21:53:28 +08:00
James Chen
151b38922e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1724-hellojs
...
Conflicts:
template/multi-platform-js/proj.win32/HelloJavascript.vcxproj
2013-02-18 16:32:54 +08:00
James Chen
1d9e9e48bc
fixed #1724 : Moved HelloJavascript to template folder and renamed it with "multi-platform-is".
2013-02-18 16:25:21 +08:00
James Chen
c6d874ab39
fixed #1712 : Updated iOS template.
2013-02-18 13:57:29 +08:00
minggo
3e3f5b83aa
fixed #1703:update xcode template
2013-02-06 16:41:44 +08:00
James Chen
23acb3eacd
issue #1687 : Updating iOS template after refactoring CCFileUtils.
2013-02-03 13:56:44 +08:00
James Chen
f0c2d310ee
Updating Android Template.
2013-01-29 15:03:36 +08:00
James Chen
31681e005e
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
2013-01-29 10:40:44 +08:00
minggo
da5b71932f
fix some errors of xcode template
2013-01-28 22:35:38 +08:00
minggo
ba9308089c
fix some errors in xcode template
2013-01-28 21:53:55 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
831c414c63
fixed #1645 : JS Project created by xcode template doesn't work correctly.
2013-01-08 15:04:59 +08:00
James Chen
f0f78d72e4
issue #1645 : Updated js template for iOS project.
2013-01-08 10:40:49 +08:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
wanbin
986f332b29
create android project has a error file path
2013-01-01 13:18:10 +08:00
minggo
2fb90d76ce
fixed #1600:update AppDelegate.cpp in xcode template
2012-12-06 11:53:10 +08:00
James Chen
77ad17bbd1
Removed libExtensions dependence for win32 template.
2012-12-04 14:29:05 +08:00
James Chen
dbeb85fa5d
Updated build-win32.bat and win32 template.
2012-12-04 14:09:19 +08:00
minggo
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00