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

359 Commits

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