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

514 Commits

Author SHA1 Message Date
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
Rohan Kuruvilla 7381abffb3 Updating template for cocos2d-x JS 2012-11-16 15:56:31 +08:00
James Chen fa071d3082 Updated js template for iOS. 2012-11-02 16:09:45 +08:00
minggo 21900c26db update xcode template and version string 2012-11-01 12:06:15 +08:00
James Chen ffe52a157f Removed some unused codes about "enableRetinaDisplay". 2012-10-24 16:12:40 +08:00
Rolando Abarca b0f02a0773 updates on the js front 2012-10-18 17:44:41 -07:00
James Chen 6178594068 issue #1486: Updated lua templates. 2012-10-12 16:19:33 +08:00
folecr bc05a650ec Add a template for the debugger script that is used when generating a new project 2012-10-04 11:48:17 -07:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
walzer edaf22f14d fix xcode4 templates compilation error for xcodebuild command line mode, caused by ios6 compatibility. 2012-09-27 00:46:09 +08:00
James Chen e4b428a875 Updated win32 template. 2012-09-26 17:55:18 +08:00
James Chen 4a3127f41f Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse. 2012-09-25 21:52:30 +08:00
walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts fixed:
	cocos2dx/platform/ios/FontLabel/FontLabel.m
	cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist
 2012-09-24 11:03:26 +08:00
walzer c50a62be7a issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
Walzer 8d51c0ed19 fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 
1. I think you guys haven't tested Xcode templates before 2.0.2 release. The templates are ALL BROKEN because CCHttpClient requires libcurl, which is excluded by xcode4_template_generator/run_generator.sh. It means developers on 2.0.2 would create a new project with compilation error, damn!

2. ios/AppController.*, ios/RootViewController.*, ios/main.m are moved from cocos2dx_*.xctemplate folder to base_ios.xctemplate folder. I don't want to modify tons of RootViewController clones any more.
 2012-09-23 22:11:29 +08:00
Walzer 88b98faa88 fixed #1482, fix orientation problem caused by ios6 api change. 
AppDelegate.mm & RootViewController.mm are updated.
 2012-09-23 20:24:51 +08:00
Rohan Kuruvilla 100a7a1883 Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla d1493a862f Updating template to support CCBuilderReader 2012-09-20 18:02:02 -07:00
Walzer d098c5900a Merge pull request #1333 from jzgenius/modify_template_by_viewController 
[template] modify AppController, add viewController & window variant. al...
 2012-09-17 19:36:18 -07:00
jzgenius 19b22be52e [template] modify AppController, add viewController & window variant. all Xcode template modified. 2012-09-18 09:55:28 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
Donald Alan Morrison 7c750dc9c5 Minor changes to comments. One integer literal changed to float literal. 2012-09-14 15:26:38 -07:00
Trent Millar a12054c00f Adding the VC++2012 template to install-templates-msvc.bat 
Tested against VS2012 RTM.

Note, the .sln location is incorect on all the templates. It needs to
move up relative to the cocos2d-x  folder.
I can look at fixing this later but for now I guess it must have been
left to the user to manually move it.
 2012-09-01 14:32:46 -06:00
James Chen 382b08a947 fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla . 2012-09-01 10:49:15 +08:00
Rohan Kuruvilla 374232ac88 Adding xcode template for cocos2dx-js 2012-08-31 12:07:58 -07:00
James Chen 9857337102 Updated android template. 
In eclipse, please using import the created project.
 2012-08-30 18:27:35 +08:00
James Chen 6a99431338 Updated hello.lua in Template folder. 2012-08-29 21:04:21 +08:00
James Chen 95419d2dea Updated templates for android,blackberry,win32 and ios. 
LAYER_CREATE_FUNC ~> CREATE_FUNC
 2012-08-29 21:03:47 +08:00
minggo c1d6edc7ad fix a bug in android template 2012-08-27 10:50:55 +08:00
James Chen 4eff148f96 Added blackberry template files. 2012-08-24 14:29:51 +08:00
minggo 3d3e5b3a93 fix some bug of xcode template & remove unneeded files 2012-08-23 18:36:08 +08:00
James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer 2012-08-21 16:57:41 +08:00