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

336 Commits

Author SHA1 Message Date
minggo 768c356343 merge natural-law-iss411 into master 2011-03-31 10:48:00 +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
walzer 2b12ef4f56 issue #411, add Zwoptex.cpp/.h & test resource into tests.xcodeproj 2011-03-30 14:54:42 +08:00
walzer 35d94eb3a5 Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411 2011-03-30 10:44:34 +08:00
walzer 6d30c123d7 Merge branch 'issue_367' of https://github.com/minggo/cocos2d-x into minggo-issue_367 2011-03-29 15:53:11 +08:00
walzer 5811fb7c76 Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422 2011-03-29 15:50:28 +08:00
minggo 27d5a670b5 [android] fixed #367: make the compiling sequece of HelloWorld and tests don't depend on alphabet order 2011-03-29 15:26:50 +08:00
natural-law 987da86c01 Merge branch 'master' into iss411 
Conflicts:
	tests/test.win32/test.win32.vcproj
	tests/tests/controller.cpp
	tests/tests/tests.h
 2011-03-29 14:26:31 +08:00
minggo c686047f83 [android] fixed #422: multitouch for android 2011-03-29 14:20:05 +08:00
natural-law 5f7357bf09 fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0. 2011-03-29 11:56:14 +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
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
yangws cd6352adec add new files to vc2010 project. 2011-03-25 17:41:54 +08:00
walzer 2bd28bd2dd issue #390, add PerformanceTest into airplay port. But, oops, I cannot see anything in these test except "back to mainmenu". 2011-03-25 16:46:36 +08:00
walzer 9c1d462275 Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430 2011-03-25 14:23:05 +08:00
walzer a205df20a4 issue #390, manually merge from Bin's work. 2011-03-25 13:59:08 +08:00
yangws be966dbddb fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
walzer db4fb7cc9c issue #427, refactor ios port ok. 2011-03-24 17:51:29 +08:00
walzer b9c56f1728 issue #427, try to add CCSAXParser.h 2011-03-24 16:16:49 +08:00
natural-law 55143e3b9e issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
walzer ef7fe5afd1 [airplay] issue #379, fix search header paths with cause compilation error on release build 2011-03-24 10:19:52 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
natural-law 96d7cedadb issue #411,implement the zwoptex test. 2011-03-22 14:59:10 +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
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 7b71a565ed fixed #400: change project.pbxproj of HelloWorld and test to include CCCamera.cpp 2011-03-18 16:09:21 +08:00
walzer d8c28d3754 Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409 2011-03-18 15:59:01 +08:00
minggo 47173778cc fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
walzer e62ff6c815 Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405 2011-03-18 14:08:52 +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
minggo 617d484257 [android] fixed #405: pause BMG music when tap HOME and resume it when it is active 2011-03-18 11:12:06 +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 61e2f56439 Add Retina display resource for tests. 
Modify CCDrawingPrimitives.cpp for retina display support.
 2011-03-15 15:12:50 +08:00
minggo 7571e1a51c Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev 2011-03-15 09:29:47 +08:00
walzer db1f54ee45 [ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS" 2011-03-14 18:31:16 +08:00
natural-law 6d028007c2 Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful. 2011-03-11 17:00:10 +08:00
minggo 723dd89fb7 Merge branch 'dev' of https://github.com/minggo/cocos2d-x into dev 2011-03-11 12:03:53 +08:00
minggo 69dcaddb51 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-11 12:01:58 +08:00
minggo 9fa282c65c [android] fix some bug and remove unneeded files 2011-03-11 11:56:33 +08:00
yangws f0661a2679 fix 4 bugs: 
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
 2011-03-11 11:04:22 +08:00
unknown 8e429c422d Build-win32.bat OK on win7 2011-03-10 21:11:14 +08:00
unknown 795f1b985f Add VC2010 project files on win32 2011-03-10 19:50:17 +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
natural-law 93aebbc469 [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
yangws 3fc701f1d2 fixed #300 Cocos2d-win32 application wizard for vs ok. 2011-03-10 12:00:29 +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
minggo 12981fac89 fixed #375 2011-03-09 16:19:20 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo 63d283d3e8 delete ccxString.h 2011-03-09 12:00:04 +08:00
minggo f1d13ca2e1 issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
minggo 7a331e1e14 issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo aaf898cb72 merge master into dev 2011-03-07 09:52:45 +08:00
minggo 69edcb16af fix a mergeing bug 2011-03-04 17:17:53 +08:00
minggo 661bae2797 merge natural-law-iss370 2011-03-04 16:32:54 +08:00
minggo 8e2f9c96b8 remove unneeded files 2011-03-04 16:22:53 +08:00
natural-law aef83b2660 [uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication. 2011-03-02 17:45:04 +08:00
yangws 395a0b3d47 AtlasTest rename to LabelTEst on win32. 2011-03-02 17:34:26 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
minggo f58d2f8b32 [andriod] fixed #247: support multitouch on android 2011-03-02 10:40:02 +08:00
minggo 0a5ec4c12b [android] move MultiTouchController.java to cocos2dx/lib/touch 2011-03-02 10:34:49 +08:00
minggo f7b401163b Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController 2011-03-02 09:38:23 +08:00
minggo e00222104f merge yangws-issue360 into dev 2011-03-02 09:31:47 +08:00
minggo 89b4d07ed8 [android] fixed #368: move Application code to cocos2dx/platform/ccxApplication 2011-03-01 19:53:39 +08:00
yangws b54de8a3ef fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate 2011-03-01 14:28:39 +08:00
minggo b65d84551b resolve confict when merging branch yangws-issue366 2011-03-01 14:08:18 +08:00
yangws 7bc7d32001 fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication 2011-03-01 12:41:57 +08:00
minggo 1b6602f582 Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android 2011-02-28 10:00:55 +08:00
minggo f504211e56 merge natural-law-iss332 to dev 2011-02-28 09:48:14 +08:00
minggo 498e0072e1 [android] fixed #358: autoscale HVGA resource to WVGA 2011-02-26 15:52:57 +08:00
minggo 1428480c7f [android] fixed #338:refactor platform_support 2011-02-25 13:35:27 +08:00
natural-law 6c54eb0a86 Update the tests from 0.99.4 to 0.99.5. 2011-02-25 11:31:49 +08:00
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +08:00
natural-law 949c1000a8 update tests to 0.99.5. 2011-02-23 16:47:25 +08:00
Macarse b52eed0782 blah 2011-02-22 22:32:24 -03:00
yangws 4d47babf9e add ; after NS_CC_BEGIN 2011-02-19 18:16:45 +08:00
natural-law 4362a5f381 [uphone]issue #316,Resolution auto adjustment. 2011-02-19 17:44:43 +08:00
natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 
Conflicts:
	HelloWorld/AppDelegate.cpp
	tests/AppDelegate.cpp
 2011-02-19 10:19:14 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
natural-law 245155e66a [uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device. 2011-02-18 10:44:49 +08:00
Macarse c6f4eab602 typo 2011-02-17 23:44:14 -03:00
Macarse 43a437a978 fixed small error 2011-02-17 23:28:17 -03:00
Macarse 4267593bf9 Used an array approach 2011-02-17 23:23:36 -03:00
natural-law 0a2ceee2c5 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev 2011-02-12 17:24:41 +08:00
minggo 043d771f1a Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev 2011-02-12 17:23:50 +08:00
natural-law 20409e7a58 delete the code for debug in cocos2d-android. 2011-02-12 17:20:13 +08:00
natural-law 8fcb9d017c delete the code for debug in cocos2d-android. 2011-02-12 17:18:25 +08:00
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	.gitignore
 2011-02-12 16:42:47 +08:00
Macarse 24c4a477e3 Fixed issue for tests 2011-02-11 00:48:46 -03:00
Macarse e1dfb21dd4 Added logic for POINTER_UP and POINTER_DOWN 2011-02-06 19:02:03 -03:00
Macarse 8d5995d5a6 First approach 2011-02-06 17:05:56 -03:00
Macarse ab44dafc6c Use SENSOR_DELAY_GAME for the SensorManager 2011-02-06 09:11:24 -03:00
Macarse 66038230eb Added logic to disable sensors from the c++ code 2011-02-05 20:17:24 -03:00
Macarse 284c330569 Added code from walzer's comment 2011-02-01 00:11:42 -03:00
Macarse fce540989d First approach 2011-01-30 20:05:30 -03: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
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
minggo d68d33b029 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-27 09:56:45 +08:00
minggo 31f9969674 fixed #333: fix compiling issue under linux 2011-01-27 09:49:06 +08:00
Macarse 89f012023e Fix display issue with Samsung Galaxy Tab 2011-01-26 19:03:14 -03:00
minggo 046668c3f1 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-26 10:02:26 +08:00
minggo 052e8634dc [android]fix a bug of SimpleAudioEngine::playEffect() 2011-01-26 09:46:34 +08:00
minggo 9e2587c26c Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-25 17:09:11 +08:00
minggo acb6b67bd9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-01-25 17:08:04 +08:00
walzer 5d051a14fa [iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog 2011-01-25 16:56:46 +08:00
minggo 4fae086e8b [android]: fps controller 2011-01-25 15:26:16 +08:00
natural-law 6a1b8d64aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-25 15:09:34 +08:00
natural-law d56575dd5a [uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath. 2011-01-25 14:26:26 +08:00
walzer 04aab22145 Merge branch 'natural-law-master' 2011-01-25 11:43:57 +08:00
minggo 59edc619a8 [android] to prevent preload effect many times 2011-01-25 11:30:25 +08:00
minggo 38b7e054bd [android]fix the error of preloadEffect() 2011-01-25 11:29:15 +08:00
natural-law 800033d98b fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile. 2011-01-24 15:53:52 +08:00
yangws 09748e88a1 SchedulerTest can output log now. 2011-01-24 14:52:16 +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
yangws 6ad3ec6bf0 HelloWorld and tests can run after move ccxApplication. 2011-01-22 17:30:00 +08:00
minggo e23c1eb2f6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-22 16:45:26 +08:00
natural-law 5cf0ee5d90 [uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0 2011-01-22 16:22:26 +08:00
minggo 4a4c0d3485 [android] fixed #321: Frame control of android. It is not so accuracy. 2011-01-22 15:10:18 +08:00
minggo 882b473291 [iphone]: font support 2011-01-21 18:15:12 +08:00
minggo b3fe7f5b6c fixed #307:merge TestAudioEngine into tests 2011-01-21 16:26:51 +08:00
minggo 01a3e37db8 [android] fix bug of build_native.sh 2011-01-21 15:45:55 +08:00
minggo cffc61d426 issue #307: add music resource 2011-01-21 15:17:23 +08:00
minggo e92970ec69 [android] fixed #311: implement cocosdenshin on android 2011-01-21 15:15:09 +08:00
minggo f9d0db48e1 issue #307: merge TestAudioEngine into tests 2011-01-21 15:11:15 +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
minggo 14fa024e48 Merge https://github.com/cocos2d/cocos2d-x into merger 2011-01-20 09:22:29 +08:00
walzer 9041d03d3b [uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger. 2011-01-19 18:02:35 +08:00
minggo d64ac9fdb8 issue #311: cocosdenshion for android 2011-01-19 16:00:19 +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
yangws 79b711a758 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +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
walzer a58acc79f3 [iphone] fixed #301, add info.plist for HelloWorld & tests 2011-01-18 12:02:27 +08:00
natural-law c682dd7084 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-18 10:16:35 +08:00
natural-law acb4a6a369 [uphone]fixed #293,modify the absolute path method in CCFileUtils. 2011-01-18 10:14:44 +08:00
walzer 04c685b95a issue #289, fix some warnings 2011-01-17 21:16:25 +08:00
walzer b60e1e1ff8 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2011-01-17 20:37:23 +08:00
yangws d2a116b001 fixed bug: Post build error on win32 when compiled project which the project's path string has space. 2011-01-17 18:01:20 +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
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
natural-law 9ccbb62f6e fixed #313,Modify the main menu of tests project from page-turning to scroll. 2011-01-12 18:00:11 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo 78a7329054 Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5 2011-01-08 09:27:58 +08:00