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

548 Commits

Author SHA1 Message Date
dumganhar fdea17b4f9 don't use DeviceOrientation, save orientation before running DirectorTest 2011-10-08 18:17:01 +08:00
dumganhar f97de356e7 add release version 2011-10-08 11:47:32 +08:00
dumganhar beaa489406 add scale support 2011-09-30 17:19:16 +08:00
dumganhar 78a06652e3 modify cocosDenshionTest resouce path 2011-09-30 09:43:23 +08:00
dumganhar a7b8610c62 delete gbk_uni_tb.dat 2011-09-30 09:39:45 +08:00
dumganhar 9ff00c7c83 use utf-8 for displaying chinese 
remove Gbk_Unicode.c Gbk_Unicode.h
 2011-09-29 17:29:38 +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 bd2266fe4c use timer as gameloop, can change FPS by using setAnimationInterval 
modify some project setting
 2011-09-29 15:52:16 +08:00
dumganhar c681889e05 add test.bada 1.2 project 2011-09-29 10:25:24 +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 8c63344c16 merge cocos2d-x master 2011-09-28 15:32:30 +08:00
minggo 3912be7f9d not get value of ok button from xml file 2011-09-28 15:27:31 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
minggo 4b02dc3e45 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-09-27 20:37:58 -07:00
minggo 4ad422defd make tests run ok on linux android 2011-09-27 20:36:21 -07:00
dumganhar 7cc86e741d delete old cocosDenshion and tests project 2011-09-28 09:47:58 +08:00
dumganhar d31859d8d3 add test.bada/sdk2.0 2011-09-28 09:41:58 +08:00
dumganhar 9f97e9473d add lib folder for Target-Release 2011-09-28 09:40:16 +08:00
dumganhar 223e32f17c add lib folder for Target-Debug and Target-Release 2011-09-28 09:39:46 +08:00
dumganhar 260c2fc920 move old 1.2 project to sdk1.2 folder 
add sdk2.0 project
 2011-09-28 09:36:18 +08:00
minggo 7b423eb708 remove unneened link 2011-09-27 17:51:13 +08:00
dumganhar f0f780a84f add empty lib folder for test project 2011-09-27 17:32:51 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00
minggo 6e08502e9d fixed #736: remove android:installLocation in AndroidManifest.xml 2011-09-27 16:56:45 +08:00
minggo 13e17ab80e make tests build ok on linux android 2011-09-27 01:51:29 -07:00
minggo c7f75fc570 make box2d build ok on linux 2011-09-26 23:30:40 -07:00
dumganhar 5a4ad2f11e modify test project setting for bada 2011-09-26 17:52:32 +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 eeb0956fb8 add linux makefiles 2011-09-20 14:38:12 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar 8cb568f7fa add some files for bada test project 2011-09-20 12:38:05 +08:00
dumganhar cac08c8f1e add tests project for bada 2011-09-20 10:29:07 +08:00
minggo 5ff9bd0c9e remame BitMapTotalHeight to bitmapTotalHeight 2011-09-19 18:15:47 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
seanlin 6d8225b7bd fixed #724, different results of CCLabelTTF on android & win32 2011-09-19 16:47:39 +08:00
dumganhar 3c795073e0 Merge branch 'master' into bada 
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
 2011-09-19 13:42:08 +08:00
dumganhar eadaba8930 modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp 
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
 2011-09-19 10:51:05 +08:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
laschweinski a4bfa976b3 change the base resource path 2011-09-16 10:23:57 +08:00
laschweinski b9ce266ee3 the same as the last one 2011-09-15 18:25:06 +08:00
minggo ae403153c7 fixed #719: update java code to HelloLua & tests 2011-09-15 16:18:50 +08:00
minggo 194f47bc54 fixed #718: get button value from string.xml & add copyright for java codes 2011-09-15 14:17:07 +08:00
Macarse 208bce312e Replaced LinearLayout with FrameLayout 2011-09-13 20:25:07 -03:00
Macarse afd1a7a6d9 External storage 2011-09-13 05:42:34 -03:00
RongHong 53227073a7 fixed #696 to modify some end() usilization 2011-09-06 11:43:09 +08:00
laschweinski 91f8ed7eb4 CCParticleSystemPoint now derive from CCParticleSystemQuade in linux 2011-09-05 11:57:10 +08:00
laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort 
Conflicts:
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/include/CCActionInstant.h
 2011-09-04 14:38:53 +08:00
liswei ab2a6cb2bb fixed #702 tests crashs at the start on wophone device 2011-08-30 15:59:06 +08:00
laschweinski b0660dd578 update eclipse project file 2011-08-29 10:28:00 +08:00