704 Commits

Author	SHA1	Message	Date
Macarse	afd1a7a6d9	External storage	2011-09-13 05:42:34 -03:00
RongHong	53227073a7	fixed #696 to modify some end() usilization	2011-09-06 11:43:09 +08:00
laschweinski	91f8ed7eb4	CCParticleSystemPoint now derive from CCParticleSystemQuade in linux	2011-09-05 11:57:10 +08:00
laschweinski	1fc09448a4	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort ... Conflicts: cocos2dx/actions/CCActionInstant.cpp cocos2dx/include/CCActionInstant.h	2011-09-04 14:38:53 +08:00
liswei	ab2a6cb2bb	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
laschweinski	b0660dd578	update eclipse project file	2011-08-29 10:28:00 +08:00
laschweinski	f86cba983f	test debug and release	2011-08-28 17:09:40 +08:00
laschweinski	1ac3fdebca	deleted: Box2D/Box2DConfig.cmake ... deleted: Box2D/CMakeLists.txt new file: CocosDenshion/.cproject new file: CocosDenshion/.project deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidDebug/makefile deleted: HelloCocos2dx/AndroidDebug/objects.mk deleted: HelloCocos2dx/AndroidDebug/sources.mk deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidRelease/makefile deleted: HelloCocos2dx/AndroidRelease/objects.mk deleted: HelloCocos2dx/AndroidRelease/sources.mk deleted: HelloCocos2dx/Classes/AppDelegate.cpp deleted: HelloCocos2dx/Classes/AppDelegate.h deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp deleted: HelloCocos2dx/Classes/HelloWorldScene.h deleted: HelloCocos2dx/Linux/main.cpp deleted: HelloCocos2dx/Linux/main.h deleted: HelloCocos2dx/Resource/CloseNormal.png deleted: HelloCocos2dx/Resource/CloseSelected.png deleted: HelloCocos2dx/Resource/HelloWorld.png deleted: HelloCocos2dx/Resource/Icon.png deleted: HelloCocos2dx/Resource/app.config.txt deleted: HelloCocos2dx/android/AndroidManifest.xml deleted: HelloCocos2dx/android/build.properties deleted: HelloCocos2dx/android/build.xml deleted: HelloCocos2dx/android/build_native.sh deleted: HelloCocos2dx/android/default.properties deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java deleted: HelloCocos2dx/android/jni/helloworld/main.cpp deleted: HelloCocos2dx/android/local.properties deleted: HelloCocos2dx/android/proguard.cfg deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png deleted: HelloCocos2dx/android/res/layout/game_demo.xml deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml deleted: HelloCocos2dx/android/res/values/strings.xml deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java modified: HelloWorld/Classes/AppDelegate.cpp deleted: HelloWorld/Linux/CloseNormal.png deleted: HelloWorld/Linux/CloseSelected.png deleted: HelloWorld/Linux/HelloWorld.png deleted: HelloWorld/Linux/Icon.png deleted: HelloWorld/Linux/Materhorn.ttf deleted: HelloWorld/Linux/app.config.txt deleted: HelloWorld/Linux/cocos2dx-hello deleted: HelloWorld/Linux/libcocos2dx.so modified: cocos2dx/.cproject modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Release/libcocos2d.so modified: template/android/mycopy_files.sh new file: tests/test.linux/.cproject new file: tests/test.linux/.project modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp modified: tests/tests/controller.cpp modified: tests/tests/tests.h	2011-08-28 14:33:04 +08:00
laschweinski	606c8803bc	modified: CocosDenshion/Linux/FmodAudioPlayer.cpp ... modified: CocosDenshion/Linux/FmodAudioPlayer.h deleted: HelloWorld/AppDelegate.cpp deleted: HelloWorld/AppDelegate.h deleted: HelloWorld/HelloWorldScene.cpp deleted: HelloWorld/HelloWorldScene.h modified: cocos2dx/.cproject modified: cocos2dx/actions/CCActionInstant.cpp modified: cocos2dx/include/CCActionInstant.h modified: lib/android/Debug/libcocos2d.so modified: lib/android/Release/libcocos2d.so modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Debug/libcocosdenshion.so modified: lib/linux/Release/libcocos2d.so modified: lib/linux/Release/libcocosdenshion.so HelloWorld/AndroidDebug/ HelloWorld/AndroidRelease/ HelloWorld/Classes/ HelloWorld/android/assets HelloWorld/postCompiled.sh cocos2dx/platform/third_party/linux/ installLinuxLib.sh tests/Res/gui_close.WAV	2011-08-25 19:04:29 +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	ae21fcaf48	[android] fixed #670: pause & resume effect when app enter background & foreground	2011-08-22 16:58:54 +08:00
laschweinski	ff5222fff8	some files missiong(eclipse with git is too hard to play)	2011-08-21 19:00:26 +08:00
laschweinski	abc856ac6d	add box2d test	2011-08-19 15:37:57 +08:00
laschweinski	60e794fcc8	add files include test and cocosDenshion	2011-08-19 14:43:19 +08:00
minggo	0a9f6c1f09	Merge pull request #478 from minggo/iss684 ... add test for displaying current language	2011-08-18 23:19:00 -07: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	11e9acb7c8	fixed #684: add test for displaying current language	2011-08-19 11:32:30 +08:00
minggo	733e582d12	fixed #684: add test for displaying current language	2011-08-19 11:26:14 +08:00
laschweinski	e3ea2bd136	modified: tests/tests/CocosDenshionTest/CocosDenshionTest.cpp ... modified: tests/tests/controller.cpp modified: tests/tests/tests.h CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-18 22:11:19 +08:00
minggo	edb8b4639d	fixed #685: add label test for displaying Chinese characters	2011-08-18 18:40:24 +08:00
minggo	ab781654d7	all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt	2011-08-17 18:24:36 +08:00
laschweinski	dbf3a94200	modified: HelloWorld/HelloWorldScene.cpp ... modified: tests/AppDelegate.cpp HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 18:09:51 +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	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
minggo	9a884ffda6	[iOS] fixed #668: CCLabelBMFont looks ok in retina mode	2011-08-10 15:07:34 +08:00
minggo	d386116255	[iOS]fixed #667: call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground	2011-08-10 10:24:06 +08:00
minggo	5e5151b41e	Merge pull request #459 from minggo/iss643 ... [android] swap axes according to the orientation	2011-08-09 00:55:34 -07:00
minggo	ada4c2af80	[android] fixed #643: swap axes according to the orientation	2011-08-09 15:50:42 +08:00
minggo	08797014e9	fix a bug that cause error when loading libtest.so on android	2011-08-09 13:56:09 +08:00
Walzer	945e5fde00	issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.	2011-08-08 21:40:33 +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
RongHong	5f08bb24fe	Merge branch 'master' into 608	2011-08-05 10:59:40 +08:00
minggo	76da5f2e84	fixed #656: remove unneeded methods & android can let user set resource path	2011-08-04 17:19:58 +08:00
minggo	ee0c6e56d7	Merge pull request #447 from minggo/master ... [android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-03 21:13:12 -07:00
minggo	7fc0dae3d9	[android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-04 12:08:12 +08:00
liswei	897dd54b12	fixed #347 add ttf support in win32	2011-08-04 11:23:59 +08: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	79cf8167dc	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347	2011-08-02 18:04:23 +08:00
liswei	188b168d30	issue #347 add ttf support in wophone	2011-08-02 18:02:27 +08:00
minggo	906e6ba519	issue #645: fix a bug of animation test	2011-08-02 15:57:04 +08:00
minggo	09dc164fff	issue #645: update to v1.0.1	2011-08-02 15:45:27 +08:00
minggo	a3b4043755	issue #347: add tests for FontTest & it works ok on android	2011-07-29 15:57:27 +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
RongHong	8afa3a9be1	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +08:00
minggo	657fe9a17d	[android] fixed #625: remove gz file in assets & use uncompressed pvr file instead	2011-07-27 11:51:19 +08:00
minggo	d446702f14	issue #633: revert CocosDenshionTest	2011-07-26 16:16:34 +08:00
minggo	1bb9e8139a	issue 33: iOS & Android support looping playing effect	2011-07-26 15:52:41 +08:00
minggo	b308effdc5	[android] fixed #631: Send \n to engine when user input nothing	2011-07-26 11:41:28 +08:00
minggo	13a1629299	fixed #624: insert white space in front of \n	2011-07-22 12:10:41 +08:00
minggo	eb2cf3afd0	[win32] add Texture2DTest to vs2010	2011-07-20 16:00:21 +08:00
natural-law	32e7ee6e2f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-20 15:35:52 +08:00
natural-law	6a8b563feb	fixed #621, Add Texture2dTest in tests project.	2011-07-20 15:35:20 +08:00
minggo	0c495628ea	Merge pull request #405 from minggo/iss618 ... invoke java code(System.exit()) to finish programe	2011-07-19 02:20:36 -07:00
minggo	640d811809	[android] fixed #618: invoke java code(System.exit()) to finish programe	2011-07-19 16:01:22 +08:00
Walzer	bc44855091	issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.	2011-07-19 15:14:59 +08:00
minggo	dd42936bb3	[android] fixed #610: remove the support of ndk-r4	2011-07-14 10:37:40 +08:00
Walzer	679f4afe06	fixed #604. When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!!	2011-07-13 18:04:53 +08:00
minggo	1a25dd83a5	Merge pull request #398 from natural-law/master ... fixed #599	2011-07-13 01:35:41 -07:00
natural-law	8ad7236ca2	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-13 16:17:50 +08:00
Walzer	62b52b37be	Merge remote branch 'origin/master'	2011-07-13 16:13:20 +08:00
Walzer	1b1fd7446c	[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade	2011-07-13 16:00:22 +08:00
minggo	692d8450c2	Merge pull request #397 from minggo/master ... fix a bug of orientation	2011-07-13 00:36:52 -07:00
minggo	a26fb13604	fix a bug of orientation	2011-07-13 15:32:03 +08:00
natural-law	9755ff59aa	When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.	2011-07-13 14:37:06 +08:00
minggo	d5850224e4	[win32] modify configuration of vs2101 release version	2011-07-13 12:05:02 +08:00
minggo	fcb2006fdc	Merge pull request #392 from natural-law/master ... fixed #599	2011-07-12 03:10:27 -07:00
minggo	faa1c8ee16	Merge pull request #393 from minggo/master ... [win32] modify for vs2010	2011-07-12 03:09:44 -07:00
minggo	760ec3201e	[win32] modify for vs2010	2011-07-12 18:05:44 +08:00
natural-law	7b10874d5e	The menu of BugsTest position is wrong when exit one bug test.	2011-07-12 18:02:40 +08:00
natural-law	d4e575c4b2	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-12 17:47:24 +08:00
natural-law	e6bc8d7c98	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-12 17:46:57 +08:00
liswei	21ce679992	resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.	2011-07-12 17:35:15 +08:00
natural-law	e8ac968b3b	Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.	2011-07-12 15:56:42 +08:00
natural-law	8b5282a0cf	fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.	2011-07-12 14:21:29 +08:00
minggo	d48c3fdfb1	upgrade to 1.0.0-final 07-11	2011-07-12 11:20:41 +08:00
natural-law	58733417e0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 15:17:24 +08:00
natural-law	fcbe0443be	Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.	2011-07-11 15:16:29 +08:00
minggo	21b1af5f1c	Merge pull request #377 from minggo/master ... [Android] break string & wrap word	2011-07-11 00:09:43 -07:00
minggo	fb436a6339	[Android] break string & wrap word	2011-07-11 15:02:41 +08:00
Walzer	28bf48f665	issue #569 #601, fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5	2011-07-11 11:21:11 +08:00
Walzer	aa12ea838e	Merge remote branch 'origin/master'	2011-07-11 10:34:47 +08:00
Walzer	63ffc574d7	fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.	2011-07-11 10:34:03 +08:00
natural-law	7bc3983f04	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 10:12:07 +08:00
natural-law	36474b2131	Add DirectorTest and BugsTest on wophone.	2011-07-11 10:11:40 +08:00
Walzer	4e12ba3015	Merge pull request #374 from axmx/master ... [airplay] fix - it solves the problems related to incorrect memory allocation..	2011-07-10 00:44:30 -07:00
Max Aksenov	7f07574630	[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....	2011-07-09 13:05:22 -07:00
minggo	2066cebd08	Merge pull request #371 from natural-law/master ... Add DirectorTest and BugsTest on android.	2011-07-08 03:49:30 -07:00
minggo	487ba5c02d	merge confict	2011-07-08 18:29:03 +08:00
minggo	87adeb6f92	upgrade xcode3 template	2011-07-08 18:24:58 +08:00
natural-law	1ffa7fbc19	Add DirectorTest and BugsTest on android.	2011-07-08 18:13:03 +08:00
Walzer	e39fca389f	Merge remote branch 'origin/master'	2011-07-08 18:01:52 +08:00
Walzer	944b03df5c	issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.	2011-07-08 18:01:28 +08:00
natural-law	1bdce00740	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/include/ccConfig.h	2011-07-08 17:08:57 +08:00
minggo	6c37f42414	Merge pull request #368 from minggo/master ... fixed #586	2011-07-08 01:46:54 -07:00
minggo	4e5306a46b	fixed #596	2011-07-08 16:27:13 +08:00
natural-law	cba538d5d0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 15:58:14 +08:00
natural-law	602c5f1894	fixed #595	2011-07-08 15:57:46 +08:00
Walzer	5c8b04bc25	fixed #585	2011-07-08 14:48:25 +08:00
Walzer	08b26402d5	fixed #594, but find a new bug #597	2011-07-08 14:27:37 +08:00
natural-law	0cb3b0ce06	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 11:23:03 +08:00
natural-law	ca4281904a	fixed #574, Add bugs test case.	2011-07-08 11:22:35 +08:00
minggo	b08788d810	change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*	2011-07-07 15:41:42 +08:00
minggo	8ca8f4d9bc	fixed #569: change the free sequence to avoid bug	2011-07-07 15:20:13 +08:00
natural-law	26513d6b7e	issue #574, Add DirectorTest for win32.	2011-07-07 14:55:11 +08:00
minggo	211878dc44	add animation	2011-07-07 10:24:01 +08:00
minggo	ff50997eb0	issue #574	2011-07-06 14:56:05 +08:00
Walzer	80c819d8b6	Merge remote branch 'origin/master'	2011-07-04 16:25:29 +08:00
Walzer	d325f1991e	[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build	2011-07-04 16:25:11 +08:00
natural-law	7d7f3a9241	fixed #562, Upgrade folder sprite_nodes to rc3.	2011-07-01 16:11:31 +08:00
natural-law	4d5dab4a40	fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.	2011-07-01 11:26:26 +08:00
minggo	25b3b15151	Merge pull request #339 from minggo/iss549 ... [Android] fixed #549: Add comments for playEffect()	2011-06-30 18:28:08 -07:00
minggo	67b85322ed	[Android] fixed #549: Add comments for playEffect()	2011-07-01 09:24:40 +08:00
minggo	12f816687d	Merge pull request #336 from liswei/master ... update wophone setup project (such as helloworld,tests)	2011-06-29 20:08:01 -07:00
minggo	2a39fe0aa4	Merge pull request #335 from minggo/iss547 ... [Android] fixed #547: line wrap OK on Android	2011-06-29 19:46:25 -07:00
liswei	39fb944297	update wophone setup project (such as helloworld,tests)	2011-06-30 09:36:51 +08:00
minggo	6c47f53b13	[Android] fixed #547: line wrap OK on Android	2011-06-29 15:45:30 +08:00
liswei	b23409a942	fixed #545 [Wophone] The effect of ChipmunkTest is wrong. ... reset glOrthof param value in wophone	2011-06-29 15:24:04 +08:00
minggo	e8853583df	Merge pull request #329 from minggo/master ... Fix some bug	2011-06-27 18:23:26 -07:00
minggo	7099b24ccb	Merge pull request #326 from liswei/issue521 ... issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 18:20:10 -07:00
yangws	3b6265aa58	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
minggo	5e15545dbd	[Android] fix an error when string is	2011-06-27 16:01:25 +08:00
liswei	bb59728543	issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 15:34:26 +08:00
minggo	686b9ae179	fix the test title	2011-06-27 15:22:55 +08:00
natural-law	72f17ecbdf	fixed #542, Record the volume user specified though the background music is not playing.	2011-06-27 11:43:27 +08:00
Walzer	688131c958	[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests	2011-06-25 12:11:40 +08:00
Walzer	00568c229a	[android] back to shared library link	2011-06-25 11:21:16 +08:00
minggo	8440d6a267	[android] fixed #364: show string correct & line break ok	2011-06-24 13:55:00 +08:00
minggo	10cdd7f798	[android] fixed #364: line break ok on Android	2011-06-23 14:44:20 +08:00
minggo	71c13b34bf	Merge https://github.com/cocos2d/cocos2d-x into iss535	2011-06-22 17:00:11 +08:00
minggo	1122a7c7d0	[android] use Android widget Bitmap other than skia to drawstring	2011-06-22 16:58:50 +08:00
Walzer	96996d4d52	Merge pull request #311 from yangws/master ... Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..	2011-06-22 01:11:49 -07:00
Walzer	1485a35338	update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4	2011-06-22 15:36:53 +08:00
yangws	01f277674e	Add icon for Helloworld and tests on Android.	2011-06-22 13:59:31 +08:00
yangws	4d8596169e	Sync java code in Helloworld and tests.	2011-06-22 11:37:42 +08:00
minggo	022e2b9998	issue #528: refactor ok on win32	2011-06-20 17:31:38 +08:00
minggo	25de09e34b	lua support ok on win32	2011-06-15 15:50:16 +08:00
minggo	8003de7468	update to latest code and merge	2011-06-14 11:01:38 +08:00
Walzer	f600846d4b	Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp	2011-06-08 11:08:29 +08:00
RongHong	67eb87abfe	To fix the crash when the gles version is too low	2011-06-08 10:02:07 +08:00
RongHong	a13e8ae859	1.修正gles版本过低时会崩溃的问题 ... 2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题	2011-06-03 15:22:50 +08:00
liswei	49410a2a07	Merge branch 'XXX'	2011-06-03 10:52:19 +08:00
liswei	54780b8cb7	fixed #521, Fix the effect of PageTurn3D.	2011-06-03 10:51:21 +08:00
minggo	83e1e0ebd1	tests run ok when it don't enable lua	2011-06-01 20:29:05 +08:00
minggo	a8b6b850de	use precompile macro to cantrol if enable lua support	2011-06-01 17:51:08 +08:00
yangws	7e2d1d5c48	fixed #490 Text input on android use a different way, TextInputTest OK now.	2011-05-30 16:36:12 +08:00
Walzer	58a63f7ec0	[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.	2011-05-30 14:14:19 +08:00
Walzer	11c401e3ea	[ios] setDepthTest(false) for EffectsTest	2011-05-26 21:01:16 +08:00
Walzer	bf95e4e7a5	Merge pull request #286 from natural-law/master ... [android] fixed #510	2011-05-26 01:39:11 -07:00
natural-law	7e716f9d80	[android] fixed #510, Delete the onDestroy method override in TestsDemo.java	2011-05-26 16:34:10 +08:00
yangws	476d86283f	Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.	2011-05-26 14:35:44 +08:00
minggo	dfbb0096e8	Merge pull request #283 from natural-law/master ... Compile tests OK on wophone.	2011-05-24 18:45:18 -07:00
natural-law	8ab7057fe6	Resolve the memory leak of tests.	2011-05-24 18:00:59 +08:00
natural-law	f89a93fcf8	Compile tests OK on wophone.	2011-05-24 17:52:24 +08:00
yangws	c757dd4aeb	fixed #503 new chipmunk code compiled ok on vs2010.	2011-05-24 16:18:47 +08:00
yangws	d93a2f046e	android can input number form soft keyboard.	2011-05-23 16:30:45 +08:00
yangws	ec23d7ed55	fixed #508 Dynamic switch retina display support.	2011-05-23 16:21:31 +08:00
yangws	533949a736	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-23 10:11:13 +08:00
Walzer	6b24b6fb8d	issue #503, i forget to add chipmunk_private.h into xcodeproj	2011-05-21 21:35:05 +08:00
Walzer	e8835ee4c2	issue #503, add chipmunk new files into win32 vcproj	2011-05-21 17:10:29 +08:00
Walzer	335d02a556	issue #503, android version build & run ok.	2011-05-21 16:45:55 +08:00
Walzer	a9027574eb	issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok	2011-05-21 16:19:01 +08:00
yangws	c9f66665ec	temp commit.	2011-05-20 17:47:06 +08:00
unknown	b940676cab	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489	2011-05-19 20:55:39 +08:00
minggo	ff1017d86f	Merge pull request #276 from minggo/iss496 ... [android] fixed #496 fixed #497	2011-05-18 23:18:37 -07:00
minggo	073260e0a9	[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0	2011-05-19 11:26:57 +08:00
Walzer	2dd11490ad	Merge pull request #274 from yangws/master ... Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.	2011-05-18 18:51:38 -07:00
yangws	5173738f37	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-18 11:08:44 +08:00
yangws	7a6a891242	fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.	2011-05-18 11:08:18 +08:00
minggo	6cf0a9d4f4	[android] fixed #494: fix a wrong function name	2011-05-18 10:54:52 +08:00
yangws	aba77f4cae	issue #489 modified for vs2008.	2011-05-13 14:13:30 +08:00
Walzer	c7fb183dcb	[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.	2011-05-12 21:58:11 +08:00
Walzer	4da5a0eb71	[android] move the TextField position to visable while soft keyboard popup	2011-05-12 21:32:57 +08:00
Walzer	f17a8f6226	Merge pull request #271 from minggo/iss488 ... [Android] CCUserDefault works ok on android2.2	2011-05-12 05:40:15 -07:00
minggo	d8f3b0c25b	[android] CCUserDefault works ok on android2.2	2011-05-12 18:32:13 +08:00
Walzer	bf04194877	Merge pull request #269 from yangws/master ... center CCTextField in TextInputTest	2011-05-12 01:59:39 -07:00
Walzer	7874ec5305	Merge pull request #270 from yangws/vs2010 ... compile ok in vs2010	2011-05-12 01:59:24 -07:00
yangws	c73c1a9ab6	compile ok in vs2010	2011-05-12 16:15:10 +08:00
yangws	01c5048203	set TextInputTest CCTextField to center.	2011-05-12 14:45:44 +08:00
natural-law	2855a9cefb	Fix the bug discovered by wophone test: ... 1. Can't play music & effect on wophone device. 2. UserDefaultTest is in the wrong path in test.wophone.vcproj.	2011-05-12 14:19:58 +08:00
minggo	a50fe1b95b	Merge pull request #267 from natural-law/master ... Modify the TextInputTest code to clean the memory leak.	2011-05-11 20:01:23 -07:00
natural-law	cc6367a835	Modify the TextInputTest code to clean the memory leak.	2011-05-12 10:54:33 +08:00
Walzer	7f0c35b158	Merge remote branch 'origin/master'	2011-05-12 10:52:33 +08:00
Walzer	10d94fb170	fixed #486, setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :)	2011-05-12 10:52:10 +08:00
natural-law	a7db186d06	Modify the test code for the right device orientation.	2011-05-12 10:11:58 +08:00
Walzer	58e9876124	change the position of TextField in TextInputTest	2011-05-11 22:15:51 +08:00
Walzer	074e127756	Merge pull request #265 from yangws/master ... fixed a bug: TextInputTestWithAction crash.	2011-05-11 05:22:38 -07:00
yangws	7dad88c556	fixed a bug: TextInputTestWithAction crash.	2011-05-11 18:45:53 +08:00
Walzer	d0ff1f274e	Merge pull request #264 from yangws/master ... fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 03:28:16 -07:00
Walzer	60f1468f57	Merge pull request #263 from yangws/input_android ... fixed a bug: delete twice when delete button click once.	2011-05-11 03:27:45 -07:00
yangws	b8a9db98dc	fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 18:22:55 +08:00
yangws	e436e177de	fixed a bug: delete twice when delete button click once.	2011-05-11 17:33:59 +08:00
yangws	21c8628e68	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 ... Conflicts: cocos2dx/platform/wophone/CCApplication_wophone.h tests/tests/tests.h	2011-05-10 16:09:26 +08:00
yangws	3f8293dffb	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input ... Conflicts: HelloWorld/wophone/HelloWorld.wophone.vcproj tests/test.wophone/copy_res.bat	2011-05-06 17:45:39 +08:00
minggo	6c69107f33	fixed #455: CCUserDefault works ok on iOS	2011-05-06 17:01:41 +08:00
yangws	ced029257f	temp commit	2011-05-06 16:38:09 +08:00
minggo	7e40957e04	Merge https://github.com/cocos2d/cocos2d-x into iss455	2011-05-06 16:29:44 +08:00
minggo	80f739942d	issue #455 : compile CCUserDefault on iOS	2011-05-06 16:29:35 +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
yangws	b95ef2f242	chipmunk test ok.	2011-05-06 12:30:52 +08:00
natural-law	846b529e49	[wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK.	2011-05-06 10:13:12 +08:00
yangws	0fe61642f6	issue #478 text input ok.	2011-05-05 18:17:50 +08:00
Walzer	dcdad9a81a	Merge pull request #250 from yangws/481 ... fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 00:53:10 -07:00
Walzer	c7e25d305a	Merge pull request #248 from yangws/input ... Split TextInputTest to Default test and Action test. Compile ok on vs2010	2011-05-05 00:50:48 -07:00
yangws	7c5a6d779c	fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 11:51:13 +08:00
Carlos Sessa	9d08f9582c	Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method	2011-05-04 11:18:26 -03:00
yangws	a5da2bd226	Split TextInputTest to Default test and Action test. Compile ok on vs2010.	2011-05-04 14:13:15 +08:00
Walzer	5dc7ef2ffc	sort the TestCases alphabetically in project.pbxproj	2011-05-03 14:48:25 +08:00
Walzer	2b8799d3ac	Merge pull request #246 from yangws/input. ... Modify tests doesn't change orientation every test scene.	2011-05-02 23:00:35 -07:00
yangws	e723a424d8	Modify tests doesn't change orientation every test scene.	2011-05-03 11:37:30 +08:00
minggo	0db248e1f1	Merge pull request #245 from yangws/input. ... TextInputTest on on ios.	2011-05-02 18:48:48 -07:00
yangws	2b94d7d9ce	TextInputTest on on ios.	2011-04-29 18:09:54 +08:00
yangws	170933b4c5	CCTextFieldTTF test code ok on win32.	2011-04-29 16:46:29 +08:00
minggo	b00c54dc64	Merged pull request #243 from minggo/iss477. ... [android] fixed #477: set default ndk version to ndk-r5	2011-04-28 19:29:15 -07:00
minggo	bb4fc1c446	[android] fixed #477: set default ndk version to ndk-r5	2011-04-29 09:59:05 +08:00
Walzer	031a750f95	[ios] issue #456, add curl into header search path for Release build.	2011-04-29 09:39:35 +08:00
yangws	d73699aabb	[ios] tests add RootViewController for rotate with ui object.	2011-04-28 14:19:12 +08:00
yangws	323c065934	make test can compile on wophone and airplay.	2011-04-28 10:31:51 +08:00
yangws	f8dc140840	change CCLabelTTF accept string from gb2312 to utf8.	2011-04-27 18:19:47 +08:00
yangws	73a3f776f0	android lanscope keyboard ok.	2011-04-27 17:01:27 +08:00
yangws	e895d9d073	TextInputTest compile ok on android and merge last master code. ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj	2011-04-26 18:04:07 +08:00
yangws	a73ccaf0e3	Cocos2dxGLSurfaceView little modify.	2011-04-26 16:40:49 +08:00
yangws	9b08f4add6	keyboard notification message on ios and TextFieldTTF test code OK.	2011-04-26 16:33:20 +08:00
minggo	1c248b9955	Merge branch 'iss462' of https://github.com/minggo/cocos2d-x	2011-04-25 16:07:16 +08:00
minggo	f11acc5e31	[android] pause/resume gl render thread when the activity is paused or remused	2011-04-25 15:53:08 +08:00
minggo	99733c602d	[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android	2011-04-25 15:13:24 +08:00
Walzer	6a11f73999	Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x	2011-04-25 14:44:21 +08:00
natural-law	7231120b16	fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.	2011-04-25 14:30:30 +08:00
moadib	85afa22195	[android] fixed typo in CCEGLView method name	2011-04-24 18:52:21 +04:00
yangws	252f3efe1a	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00
natural-law	df00c32d5b	fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone.	2011-04-22 11:49:14 +08:00
natural-law	e2ce006db2	fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.	2011-04-22 10:57:46 +08:00
natural-law	acb4bb5a16	Merge branch 'master' into iss428 ... Conflicts: template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-04-21 14:58:58 +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
minggo	e5441a4fc2	fixed #450: can set default pixel format other than RGBA8888	2011-04-20 15:34:33 +08:00
minggo	4ffe24fc8e	Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374	2011-04-19 13:45:56 +08:00
minggo	c38af3c28d	fixed #456: integrate libcurl into cocos2dx	2011-04-19 10:57:44 +08:00
minggo	a4e9f1c18d	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
minggo	37e7fad0d3	issue #456: add curl test & libcurl.so works ok on android	2011-04-15 17:15:05 +08:00
minggo	a165663b4c	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
minggo	8e85f56f97	Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews	2011-04-12 15:12:48 +08:00
minggo	d8115cacea	[android] fixed #453: cocosdenshion can replace the background music	2011-04-12 14:43:21 +08:00
minggo	0b7ca9c865	fixed #449: remove the code that suppots mac platform	2011-04-11 17:04:45 +08:00
Macarse	0203141aaf	Now the size depends on the GLView size	2011-04-11 00:28:12 -03:00
Macarse	da78032542	Added the possibility of inflating Cocos2dxGLSurfaceView from an xml	2011-04-10 17:57:17 -03:00