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

433 Commits

Author SHA1 Message Date
natural-law d905e7d475 fixed #632. Update the visual studio template for lua supported. 2011-07-27 14:28:22 +08:00
natural-law 0a8c1cada4 fixed #632, [win32] Update the visual studio template for lua supported. 2011-07-26 11:15:12 +08:00
minggo dd42936bb3 [android] fixed #610: remove the support of ndk-r4 2011-07-14 10:37:40 +08:00
minggo 87adeb6f92 upgrade xcode3 template 2011-07-08 18:24:58 +08:00
natural-law 082726f107 Update the win32 template code as same as the HelloLua project. 2011-06-27 17:15:50 +08:00
natural-law 6649987955 Add Lua support for the win32 new project template. 2011-06-27 16:45:52 +08:00
Walzer 4b7513a46e [android] roll back to use dynamic link in tempalte. 2011-06-25 14:13:08 +08:00
Walzer 70b4d701d3 fixed #538, xcode template for cocos2d-x lua project 2011-06-24 21:25:51 +08:00
Walzer 8f4b20391e Merge pull request #322 from minggo/iss538 
[Android] modify android template to work on new codes
 2011-06-24 03:02:17 -07:00
minggo a02f7c75d9 [Android] modify android template to work on new codes 2011-06-24 17:24:01 +08:00
Walzer 49b98d2057 Merge remote branch 'origin/master' 2011-06-24 17:00:29 +08:00
minggo 5677e74813 [iOS] fixed #538: add template of lua for xcode3 2011-06-24 15:35:00 +08:00
Walzer e39195d996 issue #580 add RootViewController to xcode4 templates, issue #398 fix the duplicate names to cocos2d-x 2011-06-24 12:43:45 +08:00
Walzer 37e5c21aba issue #580 add RootViewController to xcode4 templates 2011-06-24 11:38:23 +08:00
Walzer a676e0d401 [ios] issue #538, add xcode4 template for lua project 2011-06-23 17:13:53 +08:00
Walzer 094b2e7ac0 [ios] add script_support into xcode3 templates 2011-06-23 10:11:09 +08:00
Walzer 3498a91710 [ios] issue #528, add script_support into xcode4 template 2011-06-23 10:01:57 +08:00
Walzer 362ab18c97 issue #398, xcode4 template for box2d & chipmunk 2011-06-13 20:35:39 +08:00
Walzer ac9c735cb5 issue #398, add template_generator.py & generator shell script, add box2d/chipmunk/cocosdenshion ctemplate 2011-06-13 18:20:57 +08:00
Walzer a308196868 issue #398, cocos2d-x only template for xcode is ok now. hura! 2011-06-13 14:31:25 +08:00
Walzer 9266be444b issue #398, add xcode4 templates, semi-finished. 2011-06-11 16:53:48 +08:00
Walzer e7a94c6c00 issue #503, add chipmunk 5.3.4 new files into xcode3 template 2011-05-21 21:31:45 +08:00
Walzer 57a14e90c9 Merge pull request #279 from yangws/489 
fixed #489 For getting full path from relative path, GetCurrentDirectory instead GetModuleName in CCFileUtils_win32.cpp.
 2011-05-20 19:24:11 -07:00
minggo 2bd72e1793 [android] fixed #501: remove unneedded 2011-05-20 17:43:29 +08:00
minggo bcfbccc556 [android] fixed #501: let user input package path 2011-05-20 16:59:19 +08:00
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +08:00
Walzer ec27d588a6 Merge pull request #260 from minggo/iss470 
[android] fixed #470: use GAME_ROOT instead of HELLOWORLD_ROOT
 2011-05-09 00:32:02 -07:00
minggo 687a49b66d [android] fixed #470: use GAME_ROOT instead of HELLOWORLD_ROOT 2011-05-09 15:21:08 +08:00
yangws c415bc98d2 fixed #454 Include Box2D.h use Box2D/Box2D.h in vs template. 2011-05-09 10:13:24 +08:00
minggo 6c69107f33 fixed #455: CCUserDefault works ok on iOS 2011-05-06 17:01:41 +08:00
natural-law 846b529e49 [wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK. 2011-05-06 10:13:12 +08:00
Walzer ccf712a3e3 Merge pull request #247 from yangws/459. 
fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT.
 2011-05-02 23:39:28 -07:00
yangws f288516b89 fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT. 2011-05-03 14:28:31 +08:00
Walzer 8cec640c1a [airplay] fixed #480, add template for airplay 2011-05-03 14:06:57 +08:00
natural-law 07107477f4 [iOS] Modify the template files for XCode. 2011-04-29 16:45:48 +08:00
natural-law df00c32d5b fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone. 2011-04-22 11:49:14 +08:00
natural-law acb4bb5a16 Merge branch 'master' into iss428 
Conflicts:
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-04-21 14:58:58 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
walzer 32342d376a fixed #460, make cocos2dx+box2d template can find libxml2, and use libxml2.dylib in ios sdk instead of user/lib/libxml2.dylib 2011-04-19 09:26:41 +08:00
minggo 0b7ca9c865 fixed #449: remove the code that suppots mac platform 2011-04-11 17:04:45 +08:00
yangws 09c06d2410 vc2010 project compile ok. 2011-04-07 14:37:19 +08:00
yangws 16254a2de1 fixed #440 CCMessageBox works on ios. 2011-03-31 11:08:46 +08:00
natural-law c8b0d391cd fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge. 2011-03-30 15:21:18 +08:00
natural-law 1991a65b0b Merge branch 'master' into iss391 
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
 2011-03-29 10:20:57 +08:00
natural-law e38d3a2277 Merge branch 'master' into iss434 
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-03-28 17:06:32 +08:00
walzer 2f573a784e fixed #435, CocosDenshion crashes at foreground/background switching 2011-03-27 22:17:18 +08:00
walzer 71873f3e75 fixed #437, xcode3 templates doesn't content CCSAXParser.cpp & .h 2011-03-27 21:25:30 +08:00
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
walzer 4e1138fa7b Merge branch 'issue_421' of https://github.com/minggo/cocos2d-x into minggo-issue_421 2011-03-24 15:22:05 +08:00
natural-law 55143e3b9e issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
minggo 0cdc85ccd5 [android] fixed #421: create project ok on linux 2011-03-24 09:37:56 +08:00
minggo 07736e507f [android]issue #421:copy c++ files into Classes, copy pictures into Resources 2011-03-23 14:30:14 +08:00
minggo 538c5725b0 [android] issue #421: create project ok on windows 2011-03-23 09:42:23 +08:00
walzer 594dab24fc Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419 2011-03-21 17:29:09 +08:00
natural-law 09be3e8fe5 [ios]fix #419,Enable the depth test when EAGLView is created. 2011-03-21 17:15:20 +08:00
walzer 9854370db3 fixed #410, recheck the search header paths & libraries paths in xcode3 templates 2011-03-21 12:00:48 +08:00
minggo c4756779f1 [ios] modify the template 2011-03-18 20:47:45 +08:00
walzer ffeb116542 Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400 2011-03-18 16:32:20 +08:00
minggo aba427d384 fixed #400: change ios template to include CCCamera.cpp 2011-03-18 15:12:24 +08:00
walzer c15c1719ba fixed #410, recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates 2011-03-18 14:06:04 +08:00
walzer 724ac1d0a9 Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403 2011-03-18 10:08:43 +08:00
minggo 7c52a521fa fixed #403: change UIEvent to CCEvent 2011-03-18 09:39:34 +08:00
yangws 12254f95f0 fixed #395 Add initInstance code for all platform in msvc templates. 2011-03-17 11:27:51 +08:00
yangws 2802d8efd3 fixed #401 replace ConfigurationName with Cofiguration 2011-03-17 10:03:32 +08:00
walzer 4b00e7f0f6 [ios] rename template/ios_mac folder to template/xcode3 folder. Get ready for xcode4 templates 2011-03-15 15:57:36 +08:00
walzer 19d8dc6978 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-15 15:44:53 +08:00
yangws 42279c5e1d Rename templates/CCApplicationWizard.vs templates/msvc. 2011-03-15 15:33:18 +08:00
walzer 0f4648ee16 [ios] modify ios templates, split the ios-dependance sources from "Classes" folder to "ios" folder. 2011-03-15 15:12:34 +08:00
natural-law eef2c04969 [wophone]Test the template for wophone OK. 2011-03-12 10:24:36 +08:00
yangws f35af0366f replace copy with xcopy in the post event of vs wizard for win32. 2011-03-11 11:12:41 +08:00
minggo 9a67fa6df1 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-10 17:16:15 +08:00
yangws 3fc701f1d2 fixed #300 Cocos2d-win32 application wizard for vs ok. 2011-03-10 12:00:29 +08:00
minggo 06f014604a [iOS] fixed #388 2011-03-10 11:59:17 +08:00
minggo cb24e03466 Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377 2011-03-10 09:37:26 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
yangws fa7f15982f issue 300 Modify CCAppWiz to adapt 0.8. Add Install wizard scripts for VS2010 VC2010Express VC2008Express. 2011-03-09 15:35:06 +08:00
yangws b54de8a3ef fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate 2011-03-01 14:28:39 +08:00
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 2011-01-28 14:33:47 +08:00
natural-law e73e291a71 [uphone & win32]Fix the bug of new project wizard. 2011-01-27 15:01:38 +08:00
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
 2011-01-22 17:52:06 +08:00
walzer d97c40875e [win32 & uphone] add COCOS2D_DEBUG=1 into PreprocessorDefinitions of templates in MSVC. ref to this post http://www.cocos2d-x.org/boards/12/topics/392 2011-01-22 15:26:10 +08:00
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 2011-01-20 11:18:35 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
 2011-01-19 15:29:08 +08:00
natural-law ec7c24ad8d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-19 10:03:39 +08:00
natural-law f992838f96 [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00
yangws 2e8f3a26f5 Modify template for uphone. 
make it's helloworldscene code safely.
 2011-01-18 15:32:29 +08:00
yangws 5829ccd36e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-18 12:00:09 +08:00
yangws a007aa5f84 Modify the template for win32. 
Make it like the HelloWorld project.
 2011-01-18 11:45:22 +08:00
walzer b574a47b9e [iphone] fixed #302 template for xcode 2011-01-17 17:03:48 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
minggo b5b3930a95 Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5 2011-01-15 15:22:31 +08:00
minggo dca425e1b3 [iphone] add project template 2011-01-15 15:15:22 +08:00
natural-law acff950860 [uphone]fixed #315,remove the way which use resource in ResourceMap. 2011-01-14 17:42:37 +08:00
yangws aa521489a0 template for vs2008 add CocosDenshion namespace. 2010-12-25 15:44:26 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
yangws c4d0a45f3d add feature header file in CCXAppWiz HelloWorldScene.h 2010-12-11 09:50:46 +08:00
yangws 96115bc26e fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. 
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.

Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-03 15:27:55 +08:00
yangws 462a8baf33 fixed #225 Create new project from main menu ok. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-11-26 17:30:34 +08:00
yangws 1eb86dc0b9 Wizard Work OK On VS2008 CHS 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-11-26 15:36:44 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
yangws 3d4793b090 issue #186 uphone vs wizard add to Setup script. 2010-11-19 07:56:32 +00:00
yangws 011203e4eb issue #186 uphone vs wizard add to Setup script. 2010-11-19 07:56:15 +00:00
yangws 384970d4b4 issue #186 uphone vs wizard add TCOM Register files Template. 2010-11-19 06:56:57 +00:00
yangws b09c43eb56 issue #186 uphone vs wizard add Uphone Resource files Templates. 2010-11-19 06:43:13 +00:00
yangws af3bbcbc7c issue #186 uphone vs wizard add sample image. 2010-11-18 09:47:28 +00:00
yangws bba9049130 issue #186 uphone vs wizard build OK. 2010-11-18 07:46:59 +00:00
yangws 7cadac921c issue #186 add vs wizard project for uphone. 2010-11-18 02:39:59 +00:00
yangws 4a432f3125 change win32 porject name after test ok. 2010-11-17 03:13:37 +00:00
yangws c74e987af1 2010-11-16 08:36:52 +00:00
yangws e0f8553551 2010-11-16 08:36:23 +00:00
yangws 7a698c1945 issue #186 add new wizard icon 2010-11-16 08:15:21 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
yangws 2587114512 issue #186 add template/CCXAppWiz.vs to cocos2dx. 2010-11-16 03:25:33 +00:00
Walzer 6acbc6dc05 issue #198, merge test_uphone & test_win32 2010-11-12 08:25:14 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
yangws 60329478fa modify .user files 2010-11-05 03:39:55 +00:00
Walzer fb477f47f5 cleanup the heap when CCXEGLView::create failed 2010-10-29 09:27:15 +00:00
Walzer d2d9375376 add ccdirector::pause for helloworld 2010-10-29 06:48:00 +00:00
natural-law c774653018 change the comment from Chinese to English. 2010-10-29 03:49:54 +00:00
natural-law 2d650eeb73 Pause the game when the application is unactived,and resume when the game is active again. 2010-10-27 08:25:02 +00:00
natural-law 6d476cf120 debug 2010-10-22 07:58:56 +00:00
natural-law 9a94cded6f debug 2010-10-22 07:51:51 +00:00
natural-law 7be5cca13a issue #185 
Let cocos2d-uphone support WVGA
 2010-10-19 09:12:16 +00:00
Walzer bfe06e2502 commit vcproj.user files 2010-10-18 08:03:16 +00:00
Ming 17134293ad update Makefile.ARM and cocosTemplate_Arm.TMK3 2010-10-18 05:51:04 +00:00
natural-law 31c069777d issue #182 2010-10-12 03:52:11 +00:00
natural-law 05bea6a707 issue #182 2010-10-11 07:28:58 +00:00
Walzer b7e2a85384 issue #155, use static 'node' method, instead of new + init + autorelease in invoker 2010-10-08 13:15:43 +00:00
Walzer 8088513c3d issue #155, use LAYER_NODE_FUNC to implemenet static node() method 2010-10-08 04:00:28 +00:00
Walzer d509280bf5 issue #155, it's ok on emu, but not ready for linux 2010-10-02 01:14:30 +00:00
Walzer 45162616f2 cocos2dSimpleGame 2010-10-01 15:06:32 +00:00
Walzer 61ccb9f59e issue #157 Cocos2dSimpleGame, ninjia is coming! 2010-10-01 14:52:15 +00:00
Walzer b50f19e56b issue #155, template code on vs2008 & license declaration 2010-09-30 23:35:28 +00:00