Commit Graph

91 Commits

Author SHA1 Message Date
minggo c7f75fc570 make box2d build ok on linux 2011-09-26 23:30:40 -07:00
dumganhar 12750df3dc modify bada box2d project setting 2011-09-26 17:49:28 +08:00
laschweinski 88905c4a16 add box2d and chipmunk eclipse project
do the similar modification in project configuration in test.
2011-09-23 12:07:09 +08:00
dumganhar 6b2ff4605f add box2d and chipmunk makefile project for linux
delete some files
2011-09-20 17:01:08 +08:00
dumganhar d9c36f8876 delete CMakeFiles folder
delete Box2D folder
2011-09-20 16:25:01 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h>
delete old project files
2011-09-20 12:39:44 +08:00
dumganhar 54475335fb delete old bada project -- box2d and chipmunk 2011-09-19 23:35:05 +08:00
dumganhar d96e00668b modify setting of box2d in bada project 2011-09-19 23:19:39 +08:00
dumganhar bd10463980 add box2d project files for bada 2011-09-19 23:09:07 +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
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 71c442b79c chipmunk/CMakeCache.txt
chipmunk/CMakeFiles/
	chipmunk/CMakeLists.txt
	chipmunk/Makefile
	chipmunk/cmake_install.cmake
	chipmunk/src/CMakeFiles/
	chipmunk/src/Makefile
	chipmunk/src/cmake_install.cmake
	cocos2dx/platform/third_party/linux/curl/
	cocos2dx/platform/third_party/linux/libraries/libcurl.a
2011-08-28 14:28:24 +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
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
Walzer 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
walzer cb65469103 [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
unknown 795f1b985f Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00
natural-law 93aebbc469 [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo 53753b65b5 merge bada platform 2010-12-15 18:05:02 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +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
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
yangws d96599e787 2010-11-19 02:48:08 +00:00
Walzer 26bfa32ca6 issue #211 don't check out 2010-11-18 14:56:54 +00:00
Walzer 79ed40ef38 issue #211 don't check out 2010-11-18 13:47:14 +00:00
Walzer 6afe5752f2 rename directories 2010-11-18 12:32:01 +00:00
yangws b181701039 change win32 porject name 2010-11-17 02:46:43 +00:00
yangws 0618af9711 change win32 project name 2010-11-17 02:16:21 +00:00
Walzer 2935faebfc change default Makefile.ARM to build static libraries. 2010-10-26 09:51:37 +00:00
Walzer 36da6992b0 Makefile.ARM: CXX_FLAGS += -fvisibility=default 2010-10-18 02:36:00 +00:00
yangws f9b550a7b0 add user files 2010-10-13 05:11:55 +00:00
yangws 040f68160a issue #176 add test code in test_win32, which same with test_uphone . 2010-10-12 09:15:44 +00:00
Ming 661cd21b72 2010-10-12 08:33:07 +00:00
Ming 952f04557b 2010-10-12 08:08:04 +00:00
yangws 5b878a7bb0 fixed #178 build Box2d on win32 ok. 2010-10-11 08:59:21 +00:00
Walzer 6222bf9dc7 add an include path, to fix build error 2010-10-01 00:46:28 +00:00
Ming 8f4a01596f issue #166 2010-09-26 07:17:46 +00:00
natural-law 24af247630 fixed #162
Add HiResTest code
2010-09-24 04:24:38 +00:00
natural-law 16b360fd7d fixed #148
Explant Box2D and add Box2dTest
2010-09-14 06:47:12 +00:00