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

83 Commits

Author SHA1 Message Date
minggo edbbe25a98 issue #888: remove the setting for android building 2011-12-23 10:40:02 +08:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
dumganhar 265558d9c7 Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619 2011-12-15 11:36:42 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
dumganhar dea2713f51 fixed #907: add blackberry port 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry

Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-12 11:49:49 +08:00
gzito 47e108a8c5 Added marmalade support, removed airplay 2011-12-11 10:19:41 +01:00
styck bcf63d0e96 Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
dumganhar 1c9ecabd89 modify all projects config 2011-12-09 17:03:11 +08:00
dumganhar b11bcacea8 modify Device-Debug project setting, finished running on device! 2011-12-08 18:22:06 +08:00
Giovanni Zito 1eb8ba656e Added marmalade folder 2011-12-08 11:15:20 +01:00
dumganhar fa07d16f73 switch to WVGA 2011-12-08 11:07:17 +08:00
dumganhar de7754697f fixed #904: use relative path for bada 2.0 projects 2011-12-07 18:26:38 +08:00
dumganhar bfdb908d01 add Cocos2dx project 
add HelloWorld project and rename proj.blackberry fold to proj.qnx
 2011-12-06 14:56:37 +08:00
dumganhar a3ace6f20d modify some box2d source files for blackberry 2011-12-06 09:51:58 +08:00
dumganhar 791f384e4f add blackberry box2d project 2011-12-06 09:50:24 +08:00
minggo ea9cd75e67 fixed #580: update Box2d for vs2010 2011-12-01 10:08:15 +08:00
minggo 7194c25b63 issue #850: update Makefile for Box2d 2011-11-29 17:43:11 +08:00
minggo 735726355c issue #850: add Makefile for Box2d 2011-11-29 17:22:03 +08:00
minggo adfec68577 fixed #850: update Box2d for linux 2011-11-29 17:12:21 +08:00
minggo c99d254c01 issue #850: update box2d for iOS and android 2011-11-29 15:16:16 +08:00
dumganhar 89f9bd6560 issue #850: upgrate box2d to 2.2.1 version, test on win32 and bada 2011-11-29 12:50:29 +08:00
dumganhar 9586f13386 issue #850: test box2d2.2.1 on bada 2011-11-28 19:03:10 +08:00
dumganhar 10f5082a83 update box2d to version2.2.1 2011-11-25 18:30:27 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
dumganhar fd90641c49 merge testf branch 2011-10-29 14:47:13 +08:00
dumganhar 4b653c89d1 modify project configure 2011-10-25 14:12:42 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
dumganhar eb901be664 project config change 2011-10-21 09:49:57 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
Walzer ae411f9503 fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h 2011-10-18 17:41:19 +08:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
dumganhar 2f00b8ff1c update to sdk2.0.2 2011-10-09 01:11:33 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
dumganhar cda492593c modify gameloop method 
modify some project setting
 2011-09-29 02:32:01 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
minggo 13e17ab80e make tests build ok on linux android 2011-09-27 01:51:29 -07:00
dumganhar 6d55059670 add sdk2.0 project for bada 2011-09-27 16:36:28 +08:00
dumganhar a3c0bf7341 move old sdk1.2 project files to sdk1.2 folder. 2011-09-27 16:35:02 +08:00
minggo c7f75fc570 make box2d build ok on linux 2011-09-26 23:30:40 -07:00
dumganhar 12750df3dc modify bada box2d project setting 2011-09-26 17:49:28 +08:00
laschweinski 88905c4a16 add box2d and chipmunk eclipse project 
do the similar modification in project configuration in test.
 2011-09-23 12:07:09 +08:00
dumganhar 6b2ff4605f add box2d and chipmunk makefile project for linux 
delete some files
 2011-09-20 17:01:08 +08:00
dumganhar d9c36f8876 delete CMakeFiles folder 
delete Box2D folder
 2011-09-20 16:25:01 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar 54475335fb delete old bada project -- box2d and chipmunk 2011-09-19 23:35:05 +08:00
dumganhar d96e00668b modify setting of box2d in bada project 2011-09-19 23:19:39 +08:00