Commit Graph

1480 Commits

Author SHA1 Message Date
dumganhar 8ad2125139 add source code of libjpeg ,libpng ,zlib for bada 2011-09-20 02:16:20 +08:00
dumganhar ca2027fbad modify bada project 2011-09-19 23:35:46 +08:00
dumganhar edb2cbbad6 modify bada project files 2011-09-19 18:17:19 +08:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
dumganhar 3c795073e0 Merge branch 'master' into bada
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
minggo 61f2ab3cf2 fixed : fixed a typo error 2011-09-15 13:49:04 +08:00
minggo dcc5726665 Merge pull request from minggo/iss715
fixed : make sure selected image is valid
2011-09-12 23:34:27 -07:00
minggo bdb7cfdd71 fixed : make sure selected image is valid 2011-09-13 14:29:15 +08:00
minggo d763cc3884 Merge pull request from minggo/master
fixed : write doxygen comment in CCSet.h
2011-09-12 23:23:21 -07:00
minggo e2315d92b5 fixed : write doxygen comment in CCSet.h 2011-09-13 09:31:54 +08:00
Walzer 8082b91c0e fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730 2011-09-10 08:48:15 +08:00
minggo ae056a07b1 Merge pull request from minggo/iss686
fixed : set z tag of appended tile
2011-09-05 23:52:00 -07:00
minggo e2bb1d49e5 fixed : set z tag of appended tile 2011-09-06 14:01:08 +08:00
minggo 8ccc3321a3 Merge pull request from flyingpacer/renderendcrash
Renderendcrash
2011-09-05 20:52:50 -07:00
RongHong 53227073a7 fixed to modify some end() usilization 2011-09-06 11:43:09 +08:00
RongHong fea3da3156 fixed Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 11:33:48 +08:00
minggo e69d16e7d6 change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable 2011-09-06 10:52:37 +08:00
RongHong 624e27497a fixed Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 09:51:35 +08:00
minggo 018036eb28 Merge pull request from minggo/iss703
fixed : refactor Accelerometer
2011-08-31 18:30:22 -07:00
minggo f61fde764b fixed : refactor Accelerometer 2011-08-31 17:14:29 +08:00
Walzer 1402350870 fixed , add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet. 2011-08-31 14:20:33 +08:00
liswei dd90e8ce86 issue add invalid point judgement 2011-08-30 16:40:57 +08:00
liswei c8619240c4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702 2011-08-30 16:39:13 +08:00
liswei ab2a6cb2bb fixed tests crashs at the start on wophone device 2011-08-30 15:59:06 +08:00
Walzer 554e3fda52 fixed , CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone 2011-08-30 15:26:17 +08:00
Walzer 9f1e26f8a0 fixed , a stupid typo in CC_SWAP32 marco 2011-08-30 15:20:41 +08:00
minggo 0cfbf4344a fix a compiling error on wophone 2011-08-30 10:54:32 +08:00
minggo 414791a684 issue : initialize acceleration_ 2011-08-30 10:34:29 +08:00
minggo 92f741aa73 issue : remove unneeded header file 2011-08-30 09:49:55 +08:00
minggo c7fd375539 issue : make wophone support only one accelerometer delegate 2011-08-30 09:45:11 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +08:00
minggo a411f4877c fixed #698:Not invoke init() in the construction of CCSprite 2011-08-29 11:00:31 +08:00
minggo e26eaae5e1 [android] fixed : support reading file other than apk 2011-08-25 11:24:31 +08:00
minggo 55dd2545d7 Merge pull request from minggo/iss672
fixed : implement copywithzone for CCShow & CCHide
2011-08-24 01:51:30 -07:00
minggo ff34ada115 assign correct value to CCSkewY::m_fStartSkewY 2011-08-24 15:02:40 +08:00
minggo 952a01f43e fixed : implement copywithzone for CCShow & CCHide 2011-08-24 14:21:23 +08:00
minggo 75339b7630 Merge pull request from minggo/master
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 02:10:22 -07:00
minggo a7e8c36eee invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n) 2011-08-23 17:04:38 +08:00
minggo 66b453edc9 [iOS] fixed : CCLabelTTF support line break with \n 2011-08-23 16:19:31 +08:00
minggo d5457526d4 fixed : the width & height of CCRect should big or equal to 0 2011-08-23 10:46:00 +08:00
minggo 19244406d6 fixed : assert the width and height of rect is big than 0 2011-08-22 14:55:51 +08:00
minggo cd4a08aa6a Merge pull request from minggo/iss678
fixed : add constructor for CCArray
2011-08-21 20:14:06 -07:00
moadib 807ae36d6a CCMutableArray optimization 2011-08-20 01:30:33 +04:00
minggo 1f9f1f59d4 fixed : add constructor for CCArray 2011-08-19 16:15:06 +08:00
minggo 5087f6ddb2 [android] fixed : remove unneeded includes 2011-08-18 16:19:36 +08:00
minggo b4ab3f6b75 [android] fixed : remove unneeded includes 2011-08-18 16:18:26 +08:00
minggo 1640e48d5a [android] fixed : let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer 2011-08-18 16:09:49 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now.
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
Walzer 4244fdb62b fixed , swap accelerometer input x/y according to the orientation (on ios devices) 2011-08-17 20:11:33 +08:00