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

332 Commits

Author SHA1 Message Date
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