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

2941 Commits

Author SHA1 Message Date
minggo 6d358cfad7 make linux template work ok 2011-09-29 02:14:17 -07:00
dumganhar d6049846bb Merge branch 'master' into bada 2011-09-29 16:18:47 +08:00
minggo 33c7caf555 Merge pull request #535 from minggo/master 
fixed a assert error
 2011-09-29 01:13:49 -07:00
minggo a56034f177 fixed a assert error 2011-09-29 16:07:18 +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
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
dumganhar c681889e05 add test.bada 1.2 project 2011-09-29 10:25:24 +08:00
dumganhar c4fc9eed2f add HelloWorld Icons folder 2011-09-29 10:21:20 +08:00
dumganhar cda492593c modify gameloop method 
modify some project setting
 2011-09-29 02:32:01 +08:00
dumganhar 41e279585e ADD application.xml and manifest.xml 2011-09-28 23:07:19 +08:00
dumganhar 9991bc4d23 add some log in CocosDenshion 2011-09-28 22:53:51 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
dumganhar d0e6bae01e add bada copy lib bat file 2011-09-28 17:38:53 +08:00
minggo a6b42c3aa5 Merge pull request #534 from minggo/master 
Do some fixes
 2011-09-28 02:38:25 -07:00
minggo fe5eeb70d5 add files from HelloWorld/Classes 2011-09-28 17:31:50 +08:00
minggo 464fd19e59 avoid memory leak for lua and invoke unscheduleScriptFunc 2011-09-28 17:27:43 +08:00
minggo 879b987f19 Merge pull request #533 from minggo/iss717 
modify some proj setting
 2011-09-28 01:52:33 -07:00
minggo dcf803f032 modify proj setting because all cpp files of HelloWorld are moved into Classes 2011-09-28 16:46:53 +08:00
minggo 7ab3a08f36 Merge pull request #532 from minggo/iss717 
Iss717
 2011-09-28 00:37:59 -07: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 82af2051e0 add ciaranj into AUTHORS 2011-09-28 14:55:42 +08:00
minggo 4166d87869 Merge pull request #529 from ciaranj/lua_gc_additions 
Adding some lua_gc calls post script load-ins
 2011-09-27 23:36:32 -07:00
minggo 14d784c4f6 Merge pull request #530 from minggo/iss723 
fixed #723: remove unneeded files
 2011-09-27 23:36:01 -07:00
minggo 3859b7c39d fixed #723: remove unneeded files 2011-09-28 14:30:33 +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 f896369ab5 add CocosDenshion project for bada 1.2 and 2.0 2011-09-28 09:52:35 +08:00
dumganhar 56eb3060ee uiimage to uiImage 2011-09-28 09:49:57 +08:00
dumganhar 800940dd82 fixed some bug in bada port 2011-09-28 09:49:18 +08:00
dumganhar 7cc86e741d delete old cocosDenshion and tests project 2011-09-28 09:47:58 +08:00
dumganhar 2c274cb061 delete old 1.2 project 2011-09-28 09:46:40 +08:00
dumganhar 962de59a8c add Target-Debug and Target-Release folder 2011-09-28 09:45:35 +08:00
dumganhar c44998d89a add helloworld sdk1.2 project 2011-09-28 09:43:52 +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 da8a409d61 Merge pull request #528 from ciaranj/more_particle_systems_in_lua 
Add support for particleWithFile for both Quad & Point Particle Systems
 2011-09-27 18:22:07 -07:00
ciaranj 1aae893ad2 Adding some lua_gc calls post script load-ins 2011-09-27 23:23:43 +01:00
ciaranj d1f031d2de Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01: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
dumganhar c3cbeaefc6 add lib empty folder 2011-09-27 17:22:59 +08:00
dumganhar 1a8c6b06c7 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:15:50 +08:00
dumganhar a54ab3c293 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:09:14 +08:00
dumganhar cd18394b09 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:06:11 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00