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

1601 Commits

Author SHA1 Message Date
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
walzer b56014c70f issue #376, ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("") 2011-03-18 15:17:15 +08:00
minggo aba427d384 fixed #400: change ios template to include CCCamera.cpp 2011-03-18 15:12:24 +08:00
minggo 6524d037db issue #400: change vs2010 vcproj to include CCCamera.cpp 2011-03-18 15:06:26 +08:00
minggo 1ce64f1ecf issue #400: rename CCamera.cpp to CCCamera.cpp 2011-03-18 14:54:24 +08:00
minggo 7d39629c8c issue #400: rename CCamera.cpp to CCCamera.cpp 2011-03-18 14:54:03 +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
minggo 4893de18f3 [android] HelloWorld supports cocosdenshion 2011-03-18 11:01:27 +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
walzer b4d757ce9e fixed #408 @5m , fix memory leak in CCImage::_initWithPngData 2011-03-17 14:26:36 +08:00
walzer 55987c9118 Merge branch 'issue_399' of https://github.com/minggo/cocos2d-x into minggo-issue_399 2011-03-17 12:01:49 +08:00
walzer fe6487b33a Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2011-03-17 11:58:38 +08:00
yangws 12254f95f0 fixed #395 Add initInstance code for all platform in msvc templates. 2011-03-17 11:27:51 +08:00
yangws dd7934a19e Merge branch 'master' of https://github.com/yangws/cocos2d-x 2011-03-17 11:11:56 +08:00
yangws fc2818cf21 fixed #404 enableRitinaDisplay return false on iphone3 2011-03-17 11:10:50 +08:00
yangws 2802d8efd3 fixed #401 replace ConfigurationName with Cofiguration 2011-03-17 10:03:32 +08:00
minggo 91094e7e28 [android] fixed #399: fix the bug that HelloWorld crashed when touching the screen. 2011-03-17 09:49:31 +08:00
walzer 0f760e89fa #include "ccGL.h" -> #include "CCGL.h" in CCamera.cpp, for case-sensitive systems 2011-03-17 09:48:28 +08:00
walzer 59b65373e7 [bug fix] CCConfiguration::checkForGLExtension(const string&) sometimes crashes. Define it! 2011-03-16 20:53:08 +08:00
walzer 15e8ab9782 CHANGELOG for 0.8.0 2011-03-15 16:48:25 +08:00
walzer 4ffb94664c Merge branch 'yangws-dev' into dev 2011-03-15 16:31:16 +08:00
walzer 060903254f Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-15 16:31:00 +08:00
walzer fddbfd85b3 0.8.0 changelog 2011-03-15 16:18:32 +08:00
yangws e39a4e84d6 Seprate wizard install script from build-win32.bat to install-templates-msvc.bat 2011-03-15 15:59:22 +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 520cdaf96b Merge remote branch 'origin/dev' into dev 2011-03-15 15:13:43 +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
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 06ad40f101 [android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *. 2011-03-15 11:59:45 +08:00
minggo 89db0334a3 revert the modification of CCNode_mobile.cpp and CCSprite.cpp 2011-03-15 10:27:16 +08:00
minggo 4b61e713e5 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-15 10:20:56 +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 0c75af0f97 [android]fixed #356,CCLabelTTF::initWithString not crashed anymore. 2011-03-14 18:29:15 +08:00
yangws 1e67709e34 fixed #392 CC_SPRITE_DEBUG_DRAW OK. 2011-03-12 15:20:26 +08:00
natural-law b478a20765 [wophone]Run tests successful on wophone device. 2011-03-12 13:41:15 +08:00
natural-law eef2c04969 [wophone]Test the template for wophone OK. 2011-03-12 10:24:36 +08:00
natural-law dd675f8cf1 [wophone]Resolve the memory leak of CCAccelerometer. 2011-03-11 17:41:19 +08:00
natural-law 6d028007c2 Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful. 2011-03-11 17:00:10 +08:00
yangws 289f7c25f3 Modify build-win32.bat, let msbuild build debug and release configuration seprately. 2011-03-11 15:12:49 +08:00
yangws f47cdbdb79 fix bug: vs can't recgnize cocos2d-win32.vc2008.sln 2011-03-11 15:05:11 +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