Commit Graph

79 Commits

Author SHA1 Message Date
natural-law 7107c6612b fixed #563, Upgrade folder support to rc3. 2011-07-05 12:05:19 +08:00
minggo 70ce4f877f fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
liswei 91326028ec fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion) 2011-06-13 16:58:55 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo e14040730b fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +08:00
minggo 33648a9e9b issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later 2011-05-06 16:14:07 +08:00
minggo 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
Walzer bdd0b44b99 fixed a warning in CCProfiling.cpp 2011-04-29 10:08:35 +08:00
natural-law 71e4ec6aca issue #468, Fix the compile error when the target platform is not win32. 2011-04-25 15:05:16 +08:00
natural-law 7231120b16 fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest. 2011-04-25 14:30:30 +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
moadib 03093a98b5 In pointmath-related functions parameters should be passed by reference 2011-04-16 10:55:02 +04:00
yangws 041953151a issue #439 CCFileData and imageWithImageFile modified on win32. 2011-03-29 11:41:44 +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
natural-law ed2566e201 issue #434,Refactor class CCFileUtils on platform airplay. 2011-03-28 16:27:26 +08:00
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
walzer f568ad8487 issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib. 2011-03-26 14:09:42 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
walzer 81fa070125 fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
unknown 0d51d129b5 fixed #253 TileMapTest crash in windows7. 2011-03-10 23:16:38 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo 63d283d3e8 delete ccxString.h 2011-03-09 12:00:04 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +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
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
minggo 1f08213563 HelloWorld runs ok on iphone 2011-01-07 11:27:42 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Walzer edc742d41b Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master 2010-12-18 10:26:22 +08:00
Walzer 5f563102e9 fixed #265 2010-12-18 08:17:53 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
Walzer dec419be71 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
natural-law 3a0ae951b7 fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData()
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
2010-11-29 14:21:33 +08:00
natural-law 94c9addace fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:55:32 +08:00
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue #202 2010-11-12 09:26:01 +00:00