1503 Commits

Author	SHA1	Message	Date
minggo	e26eaae5e1	[android] fixed #688: support reading file other than apk	2011-08-25 11:24:31 +08:00
minggo	55dd2545d7	Merge pull request #488 from minggo/iss672 ... fixed #672: 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 #672: implement copywithzone for CCShow & CCHide	2011-08-24 14:21:23 +08:00
minggo	75339b7630	Merge pull request #486 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 #693: CCLabelTTF support line break with \n	2011-08-23 16:19:31 +08:00
root	11679d9723	Merge branch 'master' into LinuxPort	2011-08-23 11:49:46 +08:00
root	d57d9ca6f6	modified: cocos2dx/.cproject ... modified: cocos2dx/CCConfiguration.cpp modified: cocos2dx/CCConfiguration.h modified: cocos2dx/actions/CCActionGrid3D.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.h modified: cocos2dx/platform/Linux/CCImage_Linux.cpp modified: mycreate-android-project.sh new file: post.sh modified: template/android/mycopy_files.sh modified: tests/AppDelegate.cpp new file: tests/test.linux/Res deleted: tests/test.linux/Res/Hello.png deleted: tests/test.linux/Res/Images/BoilingFoam.plist deleted: tests/test.linux/Res/Images/BurstPipe.plist deleted: tests/test.linux/Res/Images/Comet.plist deleted: tests/test.linux/Res/Images/Comet.png deleted: tests/test.linux/Res/Images/ExplodingRing.plist deleted: tests/test.linux/Res/Images/Flower.plist deleted: tests/test.linux/Res/Images/Fog.png deleted: tests/test.linux/Res/Images/Galaxy.plist deleted: tests/test.linux/Res/Images/HelloWorld.png deleted: tests/test.linux/Res/Images/Icon.png deleted: tests/test.linux/Res/Images/LavaFlow.plist deleted: tests/test.linux/Res/Images/Pea.png deleted: tests/test.linux/Res/Images/Phoenix.plist deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png deleted: tests/test.linux/Res/Images/SendScoreButton.png deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png deleted: tests/test.linux/Res/Images/SpinningPeas.plist deleted: tests/test.linux/Res/Images/SpinningPeas.png deleted: tests/test.linux/Res/Images/Spiral.plist deleted: tests/test.linux/Res/Images/SpookyPeas.plist deleted: tests/test.linux/Res/Images/SpookyPeas.png deleted: tests/test.linux/Res/Images/Upsidedown.plist deleted: tests/test.linux/Res/Images/atlastest.png deleted: tests/test.linux/Res/Images/b1-hd.png deleted: tests/test.linux/Res/Images/b1.png deleted: tests/test.linux/Res/Images/b2-hd.png deleted: tests/test.linux/Res/Images/b2.png deleted: tests/test.linux/Res/Images/background.png deleted: tests/test.linux/Res/Images/background1-hd.png deleted: tests/test.linux/Res/Images/background1.png deleted: tests/test.linux/Res/Images/background2-hd.png deleted: tests/test.linux/Res/Images/background2.png deleted: tests/test.linux/Res/Images/background3-hd.png deleted: tests/test.linux/Res/Images/background3.png deleted: tests/test.linux/Res/Images/ball-hd.png deleted: tests/test.linux/Res/Images/ball.png deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt deleted: tests/test.linux/Res/Images/bitmapFontTest3.png deleted: tests/test.linux/Res/Images/blocks-hd.png deleted: tests/test.linux/Res/Images/blocks.png deleted: tests/test.linux/Res/Images/btn-about-normal.png deleted: tests/test.linux/Res/Images/btn-about-selected.png deleted: tests/test.linux/Res/Images/btn-highscores-normal.png deleted: tests/test.linux/Res/Images/btn-highscores-selected.png deleted: tests/test.linux/Res/Images/btn-play-normal.png deleted: tests/test.linux/Res/Images/btn-play-selected.png deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.png deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist deleted: tests/test.linux/Res/Images/bugs/circle-hd.png deleted: tests/test.linux/Res/Images/bugs/circle.plist deleted: tests/test.linux/Res/Images/bugs/circle.png deleted: tests/test.linux/Res/Images/bugs/corner.png deleted: tests/test.linux/Res/Images/bugs/edge.png deleted: tests/test.linux/Res/Images/bugs/fill.png deleted: tests/test.linux/Res/Images/bugs/picture-hd.png deleted: tests/test.linux/Res/Images/bugs/picture.png deleted: tests/test.linux/Res/Images/close-hd.png deleted: tests/test.linux/Res/Images/close.png deleted: tests/test.linux/Res/Images/debian.plist deleted: tests/test.linux/Res/Images/f1-hd.png deleted: tests/test.linux/Res/Images/f1.png deleted: tests/test.linux/Res/Images/f2-hd.png deleted: tests/test.linux/Res/Images/f2.png deleted: tests/test.linux/Res/Images/fire-grayscale.png deleted: tests/test.linux/Res/Images/fire.png deleted: tests/test.linux/Res/Images/fps_images.png deleted: tests/test.linux/Res/Images/grossini-hd.png deleted: tests/test.linux/Res/Images/grossini.png deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr deleted: tests/test.linux/Res/Images/grossini_dance_01.png deleted: tests/test.linux/Res/Images/grossini_dance_02.png deleted: tests/test.linux/Res/Images/grossini_dance_03.png deleted: tests/test.linux/Res/Images/grossini_dance_04.png deleted: tests/test.linux/Res/Images/grossini_dance_05.png deleted: tests/test.linux/Res/Images/grossini_dance_06.png deleted: tests/test.linux/Res/Images/grossini_dance_07.png deleted: tests/test.linux/Res/Images/grossini_dance_08.png deleted: tests/test.linux/Res/Images/grossini_dance_09.png deleted: tests/test.linux/Res/Images/grossini_dance_10.png deleted: tests/test.linux/Res/Images/grossini_dance_11.png deleted: tests/test.linux/Res/Images/grossini_dance_12.png deleted: tests/test.linux/Res/Images/grossini_dance_13.png deleted: tests/test.linux/Res/Images/grossini_dance_14.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng deleted: tests/test.linux/Res/Images/grossinis_sister1.png deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister2.png deleted: tests/test.linux/Res/Images/landscape-1024x1024.png deleted: tests/test.linux/Res/Images/logo-mipmap.pvr deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr deleted: tests/test.linux/Res/Images/menuitemsprite.png deleted: tests/test.linux/Res/Images/paddle-hd.png deleted: tests/test.linux/Res/Images/paddle.png deleted: tests/test.linux/Res/Images/particles-hd.png deleted: tests/test.linux/Res/Images/particles.png deleted: tests/test.linux/Res/Images/pattern1.png deleted: tests/test.linux/Res/Images/piece.png deleted: tests/test.linux/Res/Images/powered.png deleted: tests/test.linux/Res/Images/r1-hd.png deleted: tests/test.linux/Res/Images/r1.png deleted: tests/test.linux/Res/Images/r2-hd.png deleted: tests/test.linux/Res/Images/r2.png deleted: tests/test.linux/Res/Images/snow.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png deleted: tests/test.linux/Res/Images/spritesheet1.png deleted: tests/test.linux/Res/Images/stars-grayscale.png deleted: tests/test.linux/Res/Images/stars.png deleted: tests/test.linux/Res/Images/stars2-grayscale.png deleted: tests/test.linux/Res/Images/stars2.png deleted: tests/test.linux/Res/Images/streak.png deleted: tests/test.linux/Res/Images/test-rgba1.png deleted: tests/test.linux/Res/Images/test_blend.png deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr deleted: tests/test.linux/Res/Images/test_image.jpeg deleted: tests/test.linux/Res/Images/test_image.png deleted: tests/test.linux/Res/Images/test_image.pvr deleted: tests/test.linux/Res/Images/test_image.pvrraw deleted: tests/test.linux/Res/Images/test_image_a8.pvr deleted: tests/test.linux/Res/Images/test_image_ai88.pvr deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr deleted: tests/test.linux/Res/Images/test_image_i8.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr deleted: tests/test.linux/Res/Images/texture1024x1024.png deleted: tests/test.linux/Res/Images/texture2048x2048.png deleted: tests/test.linux/Res/Images/texture512x512.png deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/iso-test.png deleted: tests/test.linux/Res/TileMaps/iso-test.tmx deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2.png deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx deleted: tests/test.linux/Res/TileMaps/iso.png deleted: tests/test.linux/Res/TileMaps/levelmap.tga deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx deleted: tests/test.linux/Res/TileMaps/ortho-test1.png deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png deleted: tests/test.linux/Res/TileMaps/ortho-test2.png deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx deleted: tests/test.linux/Res/TileMaps/tiles-hd.png deleted: tests/test.linux/Res/TileMaps/tiles.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png deleted: tests/test.linux/Res/animations/dragon_animation-hd.png deleted: tests/test.linux/Res/animations/dragon_animation.png deleted: tests/test.linux/Res/animations/ghosts.plist deleted: tests/test.linux/Res/animations/ghosts.png deleted: tests/test.linux/Res/animations/grossini-aliases.plist deleted: tests/test.linux/Res/animations/grossini-aliases.png deleted: tests/test.linux/Res/animations/grossini.plist deleted: tests/test.linux/Res/animations/grossini.plist.xml deleted: tests/test.linux/Res/animations/grossini.png deleted: tests/test.linux/Res/animations/grossini.ztp deleted: tests/test.linux/Res/animations/grossini_blue.plist deleted: tests/test.linux/Res/animations/grossini_blue.png deleted: tests/test.linux/Res/animations/grossini_family.plist deleted: tests/test.linux/Res/animations/grossini_family.png deleted: tests/test.linux/Res/animations/grossini_gray.plist deleted: tests/test.linux/Res/animations/grossini_gray.png deleted: tests/test.linux/Res/app.config.txt deleted: tests/test.linux/Res/background.mp3 deleted: tests/test.linux/Res/effect1.wav deleted: tests/test.linux/Res/effect2.ogg deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf deleted: tests/test.linux/Res/fonts/Abberancy.ttf deleted: tests/test.linux/Res/fonts/Abduction.ttf deleted: tests/test.linux/Res/fonts/Paint Boy.ttf deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf deleted: tests/test.linux/Res/fonts/arial16.fnt deleted: tests/test.linux/Res/fonts/arial16.png deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest.png deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png deleted: tests/test.linux/Res/fonts/fps_images-hd.png deleted: tests/test.linux/Res/fonts/fps_images.png deleted: tests/test.linux/Res/fonts/futura-48.fnt deleted: tests/test.linux/Res/fonts/futura-48.png deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt deleted: tests/test.linux/Res/fonts/konqa32-hd.png deleted: tests/test.linux/Res/fonts/konqa32.fnt deleted: tests/test.linux/Res/fonts/konqa32.png deleted: tests/test.linux/Res/fonts/larabie-16-hd.png deleted: tests/test.linux/Res/fonts/larabie-16.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png deleted: tests/test.linux/Res/music.mid deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist deleted: tests/test.linux/Res/zwoptex/grossini-generic.png deleted: tests/test.linux/Res/zwoptex/grossini.plist deleted: tests/test.linux/Res/zwoptex/grossini.png CocosDenshion/AndroidDebug/ CocosDenshion/AndroidRelease/ HelloCocos2dx/AndroidDebug/2 HelloCocos2dx/android/assets HelloCocos2dx/postCompiled.sh installLinuxLib.sh	2011-08-23 11:28:04 +08:00
minggo	d5457526d4	fixed #689: the width & height of CCRect should big or equal to 0	2011-08-23 10:46:00 +08:00
minggo	19244406d6	fixed #689: assert the width and height of rect is big than 0	2011-08-22 14:55:51 +08:00
minggo	cd4a08aa6a	Merge pull request #479 from minggo/iss678 ... fixed #679: add constructor for CCArray	2011-08-21 20:14:06 -07:00
laschweinski	8f4d47900b	new file: cocos2dx/.cproject ... new file: cocos2dx/.project	2011-08-21 19:03:46 +08:00
moadib	807ae36d6a	CCMutableArray optimization	2011-08-20 01:30:33 +04:00
minggo	1f9f1f59d4	fixed #679: add constructor for CCArray	2011-08-19 16:15:06 +08:00
laschweinski	60e794fcc8	add files include test and cocosDenshion	2011-08-19 14:43:19 +08:00
laschweinski	871abb4a32	Merge branch 'master' into LinuxPort	2011-08-19 13:20:23 +08:00
laschweinski	ad305648c0	modified: cocos2dx/misc_nodes/CCRenderTexture.cpp ... modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-19 13:07:50 +08:00
minggo	5087f6ddb2	[android] fixed #683: remove unneeded includes	2011-08-18 16:19:36 +08:00
minggo	b4ab3f6b75	[android] fixed #683: remove unneeded includes	2011-08-18 16:18:26 +08:00
minggo	1640e48d5a	[android] fixed #683: 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 #643, swap accelerometer input x/y according to the orientation (on ios devices)	2011-08-17 20:11:33 +08:00
minggo	e39d551294	fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed	2011-08-17 15:00:32 +08:00
laschweinski	5d20ebe24b	modified: HelloWorld/AppDelegate.cpp ... modified: HelloWorld/HelloWorldScene.cpp modified: cocos2dx/cocoa/CCNS.cpp modified: cocos2dx/include/CCActionInstant.h modified: cocos2dx/misc_nodes/CCRenderTexture.cpp modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp modified: cocos2dx/platform/CCAccelerometer_platform.h modified: cocos2dx/platform/CCApplication_platform.h modified: cocos2dx/platform/CCArchOptimalParticleSystem.h modified: cocos2dx/platform/CCCommon.cpp modified: cocos2dx/platform/CCEGLView_platform.h modified: cocos2dx/platform/CCGL.cpp modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp modified: cocos2dx/platform/CCPlatformConfig.h modified: cocos2dx/platform/CCPlatformMacros.h modified: cocos2dx/platform/CCSAXParser.h modified: cocos2dx/platform/CCStdC.h modified: cocos2dx/support/CCUserDefault.cpp modified: cocos2dx/support/data_support/ccCArray.h modified: tests/AppDelegate.cpp deleted: tests/Res/music.mid modified: tests/tests/controller.cpp modified: tests/tests/tests.h HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 11:36:54 +08:00
Walzer	3afe6ebfb2	fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.	2011-08-16 11:56:17 +08:00
Walzer	0881668cc2	fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well	2011-08-15 12:10:11 +08:00
GavT	f47df23363	Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661 ... Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h	2011-08-11 20:47:54 -07:00
Walzer	4aa33b0942	Merge pull request #463 from minggo/master ... fixed #668	2011-08-10 19:32:44 -07:00
Walzer	6d3941ebc1	Merge pull request #464 from leon-li/master ... fix some warnings under xcode 4.0 llvm clang	2011-08-10 19:32:16 -07:00
Leon	771e2349c5	fix some warnings under xcode 4.0 llvm compiler	2011-08-10 22:39:02 +08:00
minggo	9a884ffda6	[iOS] fixed #668: CCLabelBMFont looks ok in retina mode	2011-08-10 15:07:34 +08:00
Walzer	6eba0b658f	fixed #651, add CCFileUtils to doxygen api document	2011-08-08 23:05:47 +08:00
minggo	2b5635898a	fixed #665: add test of RenderTextureSave	2011-08-08 14:06:03 +08:00
minggo	7a0e8b4a0a	Merge pull request #457 from minggo/iss642 ... fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-07 20:08:16 -07:00
minggo	41ea2e98a1	fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-08 11:01:47 +08:00
liswei	70e19d7245	fixed #347 fixed 'AddFontResource' path error!	2011-08-08 10:32:21 +08:00
Walzer	976d886263	Merge pull request #455 from giom/master ... Lua AddSearchPath issue #647	2011-08-05 18:43:44 -07:00
minggo	2d5a04b9ca	Merge pull request #454 from flyingpacer/608 ... fixed #608 rendertexture disappears after going to background	2011-08-04 23:55:26 -07:00
minggo	dd43f16c8e	fixed #622: add comment of CCUserDefault	2011-08-05 11:02:42 +08:00
RongHong	5f08bb24fe	Merge branch 'master' into 608	2011-08-05 10:59:40 +08:00
minggo	016c463659	Merge pull request #449 from flyingpacer/savecrash ... fixed #657 Latest git version was broken	2011-08-04 02:39:33 -07:00
minggo	76da5f2e84	fixed #656: remove unneeded methods & android can let user set resource path	2011-08-04 17:19:58 +08:00
RongHong	4745b85af9	fixed #657 Latest git version was broken	2011-08-04 16:37:43 +08:00
liswei	bbc4bbeb6c	issue #347 lost [] in 'delete array'	2011-08-04 13:47:21 +08:00
liswei	897dd54b12	fixed #347 add ttf support in win32	2011-08-04 11:23:59 +08:00
minggo	78ffea3049	Merge pull request #443 from natural-law/master ... fixed #513	2011-08-02 23:35:35 -07:00
minggo	6892787afa	fixed #653: add CCScheduler::unscheduleScriptFunc()	2011-08-03 14:15:35 +08:00
natural-law	3a80e51d25	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-03 11:39:03 +08:00
natural-law	94f2d8a5e2	fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame.	2011-08-03 11:38:38 +08:00
minggo	78642a39ac	[android] fixed #652: refactor JniHelper::jstringtochar()	2011-08-03 10:44:39 +08:00
minggo	b9374663cd	Merge pull request #440 from flyingpacer/savecrash ... fixed #649 the user could save any domain of the render texture	2011-08-02 03:16:20 -07:00
minggo	90f403d8a2	Merge pull request #441 from liswei/issue347 ... issue #347 add ttf support in wophone	2011-08-02 03:16:06 -07:00
liswei	188b168d30	issue #347 add ttf support in wophone	2011-08-02 18:02:27 +08:00
RongHong	4a8e3f468e	fixed #649 the user could save any domain of the render texture	2011-08-02 17:22:57 +08:00
minggo	09dc164fff	issue #645: update to v1.0.1	2011-08-02 15:45:27 +08:00
RongHong	3a3a52c59a	fixed #649 the user could save any domain of the render texture	2011-08-02 14:25:58 +08:00
minggo	730ff63c9f	rename scene to node	2011-08-02 14:09:23 +08:00
minggo	c4d1dedba8	Merge https://github.com/reflog/cocos2d-x into reflog	2011-08-02 14:03:34 +08:00
minggo	9fe868b881	Merge pull request #438 from natural-law/master ... Use the setter to set the value of m_tAnchorPoint.	2011-08-01 21:39:43 -07:00
natural-law	9a86582cd2	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-02 11:06:47 +08:00
natural-law	d6221cfa36	Use the setter to set the value of m_tAnchorPoint.	2011-08-02 11:02:02 +08:00
RongHong	d575d40ab3	fixed #648 savebuffer may crash on some machines like Motorola Defy	2011-08-02 10:27:52 +08:00
RongHong	335d2d30b4	fixed #648 savebuffer may crash on some machines like Motorola Defy	2011-08-02 10:05:15 +08:00
Guillaume Maury	f86da27a38	Merge branch '0.9.0'	2011-08-02 03:49:36 +08:00
Guillaume Maury	b789927ca3	added possibility to add a path to the lua search path (package.path/LUA_PATH)	2011-08-02 03:47:39 +08:00
minggo	63839de12a	Merge https://github.com/cocos2d/cocos2d-x into iss347	2011-08-01 18:23:14 +08:00
minggo	895d4992e4	issue #347: FontTest runs ok on iOS	2011-08-01 18:22:47 +08:00
natural-law	5b0f25466a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-01 10:45:40 +08:00
natural-law	bf44d13bc9	fixed #644, m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.	2011-08-01 10:44:18 +08:00
minggo	52df611822	Merge pull request #434 from flyingpacer/641 ... fixed #641 the user could save buffer to any path	2011-07-31 18:20:28 -07:00
Eli Yukelzon	41bdb281dc	corrected bug and leak in getBool	2011-07-31 15:31:39 +03:00
Eli Yukelzon	af61a7c650	added support for optional default values in CCUserDefault getters	2011-07-31 15:08:25 +03:00
Eli Yukelzon	9c5fa51e6b	usuful macros for defining scene() and node() methods with params	2011-07-30 11:55:38 +03:00
Eli Yukelzon	b2dce6ab80	Merge remote-tracking branch 'upstream/master'	2011-07-30 09:32:44 +03:00
minggo	a3b4043755	issue #347: add tests for FontTest & it works ok on android	2011-07-29 15:57:27 +08:00
RongHong	a54fda812b	fixed #641 the user could save buffer to any path	2011-07-29 11:36:04 +08:00
minggo	cfb3765035	issue #347: iOS support font defined by ttf file	2011-07-29 10:15:10 +08:00
natural-law	d37a694529	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/platform/CCImage.cpp	2011-07-29 09:51:43 +08:00
natural-law	5ad318fa71	Resolve the cocos2d compile error on wophone.	2011-07-29 09:50:06 +08:00
minggo	87f0b6c63f	Merge pull request #431 from flyingpacer/640 ... fixed #640 the image read from render texture is upseted	2011-07-28 18:42:14 -07:00
Eli Yukelzon	41ec0ba945	modification to support radio menu	2011-07-28 22:18:45 +03:00
reflog	ae945f4880	changes to support CCScrollLayer	2011-07-28 17:09:06 +03:00
minggo	50038b7cc2	Merge https://github.com/cocos2d/cocos2d-x into iss347	2011-07-28 18:06:20 +08:00
RongHong	c7aa948817	fixed #640 the image read from render texture is upseted	2011-07-28 18:02:25 +08:00
RongHong	c1fdf9afb5	issue #608 rendertexture disappears after going to background	2011-07-28 17:32:09 +08:00
minggo	648117ebb5	issue #347: android can use ttf file	2011-07-28 17:20:37 +08:00
natural-law	a7404dc2bf	fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter.	2011-07-28 16:16:51 +08:00
natural-law	d4db9eb566	fixed #636, Modify the implementation of method CCTextureCache::textureForKey().	2011-07-28 15:08:07 +08:00
Leon	a8e4d5ea89	rename CCMenu::menu() -> CCMenu::node()	2011-07-28 14:24:24 +08:00
Leon	4c06cb853b	Merge remote branch 'upstream/master'	2011-07-28 12:27:07 +08:00
RongHong	0f94423b9b	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-28 10:52:09 +08:00
Leon	4510101e96	add CCMenu::init() and CCMenu::menu() to create empty menus	2011-07-28 10:45:32 +08:00
RongHong	aec1ddc4b4	Merge branch 'master' into 630	2011-07-28 10:10:47 +08:00
RongHong	eda6228374	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-28 10:09:56 +08:00
RongHong	a253909030	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-27 16:55:04 +08:00
RongHong	8afa3a9be1	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +08:00
minggo	33e85bdc53	Merge pull request #421 from leon-li/master ... add CCMenuItem::setTarget	2011-07-26 18:48:24 -07:00
Leon	c5f7036f7b	add CCMenuItem::setTarget	2011-07-26 18:41:58 +08:00
liswei	1e8e036da7	issue #633 add playeffect loop in wophone	2011-07-26 17:04:39 +08:00