Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,895 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

335 Commits

Author SHA1 Message Date
dumganhar a59fa1d596 use AudioOut to play effect 2011-10-18 18:10:53 +08:00
dumganhar 40cf322d60 don't use CCAudioOut 2011-10-18 11:11:36 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
dumganhar e247668ee0 AudioOut support ogg format 2011-10-18 09:45:04 +08:00
minggo 80cd3266df make HelloWorld and tests work ok on linux with eclipse 2011-10-16 02:21:17 -07:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
dumganhar 7d9ff2af6f rename some files 2011-10-14 18:33:14 +08:00
dumganhar eaad344762 resert some files 2011-10-14 17:57:44 +08:00
zhangxm 0086da0ee0 add link path & copy cocosdenshion depended libs into lib/linux/Debug 2011-10-14 02:30:49 -07:00
dumganhar f1614fb4de open media file succeed, insert list 2011-10-14 17:30:36 +08:00
dumganhar f7bd325d2b use Osp::Media::Player for playing effect 
remove old AudioOut method
 2011-10-14 16:03:06 +08:00
dumganhar 5fa24269b7 use Osp::Media::Player to playing effect.support mp3, aac, ... 2011-10-14 09:20:03 +08:00
dumganhar 2f00b8ff1c update to sdk2.0.2 2011-10-09 01:11:33 +08:00
dumganhar f2ab09958f add setResourcePath for SimpleAudioEngine 2011-09-29 22:53:38 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
dumganhar cda492593c modify gameloop method 
modify some project setting
 2011-09-29 02:32:01 +08:00
dumganhar 9991bc4d23 add some log in CocosDenshion 2011-09-28 22:53:51 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
minggo 3859b7c39d fixed #723: remove unneeded files 2011-09-28 14:30:33 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
dumganhar f896369ab5 add CocosDenshion project for bada 1.2 and 2.0 2011-09-28 09:52:35 +08:00
dumganhar 7cc86e741d delete old cocosDenshion and tests project 2011-09-28 09:47:58 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00
minggo 4f7e349c0a set HelloWorld dependence and make it run ok on android emulator 2011-09-26 22:38:59 -07:00
dumganhar fce8ce5924 modify CocosDenshion and chipunk project setting for bada 2011-09-26 17:53:16 +08:00
laschweinski 0f7a15b1b3 recommit 
modify eclipse project config
delete libs and use the folder eclipse generated instead.
 2011-09-23 09:56:30 +08:00
zhangxiaoming 1cac9520cc make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion 2011-09-21 02:27:42 -07:00
dumganhar eeb0956fb8 add linux makefiles 2011-09-20 14:38:12 +08:00
minggo 762e342b4d fixed #727: invoke DeleteLocalRef() to resolve memory leak 2011-09-20 14:25:16 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar ca2027fbad modify bada project 2011-09-19 23:35:46 +08:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
minggo 8fbe6dcb3f fixed #716: don't convert effect volume to int 2011-09-13 14:10:32 +08:00
laschweinski 8f5c327937 add all eclipse project files to the corresponding directory 2011-09-07 12:44:03 +08:00
laschweinski 310e79a491 delete the project configurations in base folder 2011-09-07 12:41:39 +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
Walzer 6347f878c2 fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade 2011-08-31 16:35:40 +08:00
Augusto Souza 28b1f317f4 Revert "First version of unloadBackgroundMusic for android - Feature #687" 
This reverts commit a157b775f8.
 2011-08-30 09:30:12 -03:00
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +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
Augusto Souza a157b775f8 First version of unloadBackgroundMusic for android - Feature #687 2011-08-28 01:02:12 -03:00
Augusto Souza 3a0c2cb4fb First version of a preloadBackgroundMusic for Android - Feature #687 2011-08-27 23:24:52 -03: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 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
laschweinski 60e794fcc8 add files include test and cocosDenshion 2011-08-19 14:43:19 +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
liswei 52cdcbcbe4 fixed #633 add playeffect looply,in win32 2011-07-28 09:58:10 +08:00
liswei 1e8e036da7 issue #633 add playeffect loop in wophone 2011-07-26 17:04:39 +08:00
minggo 1bb9e8139a issue 33: iOS & Android support looping playing effect 2011-07-26 15:52:41 +08:00
minggo fdf2834b63 Merge pull request #370 from liswei/issue583 
fixed #583 playBackgroundMusic("background-music-aac.wav", true) has no effect on win32
 2011-07-08 02:23:38 -07:00
liswei 82f2104e69 fixed #583 modify SimpleAudioEngine resource path ,in win32 2011-07-08 16:49:19 +08:00
Walzer dead4cd717 fixed #593 CocosDenshion 2011-07-08 16:08:54 +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 1584a96214 [win32] modify CocosDenshion project file to show correct in vs2008 2011-06-15 16:22:22 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
yangws 6856ffc22c Modify SoundPlayer.cpp for the last TMediaPlayer.so 2011-05-19 14:57:16 +08:00
yangws e6c7d9fe63 fixed bug: The background music not stoped when app enter background some time. 2011-05-18 14:34:22 +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
walzer cb65469103 [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
walzer 6c2f66792f issue #422, add CocosDenshion implementation on airplay port. But it doesn't work correctly. 2011-03-31 17:53:35 +08:00
minggo 22b55eaf78 issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +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
natural-law 6a1b8d64aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-25 15:09:34 +08:00
natural-law d56575dd5a [uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath. 2011-01-25 14:26:26 +08:00
yangws 90e8762cd5 fixed bug: tests::CocosDenshionTest can't exit program when music playing. 2011-01-24 14:31:51 +08:00
minggo fe9c7a7be3 [win32] return float value of volume 2011-01-22 16:40:05 +08:00
natural-law 5cf0ee5d90 [uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0 2011-01-22 16:22:26 +08:00
minggo dd979a4ed9 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-21 16:29:13 +08:00
minggo b3fe7f5b6c fixed #307:merge TestAudioEngine into tests 2011-01-21 16:26:51 +08:00
minggo e92970ec69 [android] fixed #311: implement cocosdenshin on android 2011-01-21 15:15:09 +08:00
minggo dfad6ab9f9 change the interface of SimpleAudioEngine 2011-01-21 15:14:07 +08:00
natural-law 3d225465c0 [uphone]fixed #308,BGM is paused when press power key to make uphone sleep. 2011-01-20 13:41:58 +08:00
minggo 14fa024e48 Merge https://github.com/cocos2d/cocos2d-x into merger 2011-01-20 09:22:29 +08:00
walzer e22ec58feb [iphone] fix compilation error on SimpleAudioEngine::setResource(...) 2011-01-19 16:51:40 +08:00
minggo d64ac9fdb8 issue #311: cocosdenshion for android 2011-01-19 16:00:19 +08:00
natural-law ec7c24ad8d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-19 10:03:39 +08:00
natural-law f992838f96 [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00
walzer 3a844f5527 [uphone] fix Makefile.ARM for CocosDenshion 2011-01-18 14:54:56 +08:00
natural-law acff950860 [uphone]fixed #315,remove the way which use resource in ResourceMap. 2011-01-14 17:42:37 +08:00
minggo 7efa234d53 issue 311: add some codes to support cocosdenshion on android, the implementation has not implemented 2011-01-12 11:49:54 +08:00
natural-law 3072961d31 issue #310.Modify the SimpleAudioEngine in cocos2d-win32. 2011-01-11 17:01:06 +08:00
natural-law 3d45614227 issue #310.Modify the SimpleAudioEngine in cocos2d-uphone. 2011-01-11 16:41:06 +08:00
minggo 221943fc26 rename SimpleAudioEngine::release() to SimpleAudioEngine::end() 2011-01-10 11:47:59 +08:00
minggo dca85259b1 cocosdenshion ok on iphone 2011-01-10 11:39:34 +08:00
minggo 3712372cc8 issue #241: add some files to support cocosdension for iphone 2011-01-08 13:41:27 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00
natural-law 9af3d2874d fixed #261 Fix a bug of function SoundPlayer::PlaySoundFromMem(). 2010-12-14 18:03:31 +08:00
natural-law 0ab7e88f9f fixed #249 implement read sound data from zip file in SimpleAudioEngine 2010-12-11 11:08:03 +08:00
yangws 678d74ce8e fixed #235 PlayBackMusic use SimpleAudioEngine on win32 can repeat now. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-06 10:43:35 +08:00
natural-law b3bb3ce461 Merge branch 'iss228' 2010-11-30 14:37:35 +08:00
natural-law 070439382e fixed #228 Optimize function SimpleAudioEngine::stopBackgroundMusic 2010-11-30 14:37:11 +08:00
Walzer 8128c1b322 issue #196 fix the bug in doxyen of SimpleAudioEngine 2010-11-29 22:17:30 +08:00
natural-law 6c4d415173 fixed #221 2010-11-26 11:31:03 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
natural-law 5b7dc66817 debug 2010-11-19 07:22:21 +00:00
yangws d96599e787 2010-11-19 02:48:08 +00:00
Walzer 0ad77b779a issue #211 don't checkout 2010-11-18 15:55:00 +00:00
Walzer 26bfa32ca6 issue #211 don't check out 2010-11-18 14:56:54 +00:00
Walzer 5a44e5f1fe issue #211 don't checkout 2010-11-18 13:51:33 +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 bba9049130 issue #186 uphone vs wizard build OK. 2010-11-18 07:46:59 +00:00
Walzer 0a2567c646 SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine 2010-11-17 08:31:48 +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 fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
natural-law f73ecd91bb issue #196 
add comment of SimpleAudioEngine code
 2010-11-12 08:33:50 +00:00
natural-law 70421ccc84 issue #168 
debug
 2010-11-12 03:48:51 +00:00
natural-law 7e0b582ab0 issue #168 
debug
 2010-11-12 02:59:38 +00:00
natural-law 85555c50d7 issue #168 
debug
 2010-11-12 02:58:19 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
yangws dba50b2693 fixed #180 implement SimpleAudioEngine using MCI. Support Midi and wave default. 2010-10-22 01:39:14 +00:00
natural-law 0397ea0a74 issue #182 2010-10-21 06:44:02 +00:00
natural-law 27f125cc77 issue #168 
reconstruct the SimpleAudioEngine
 2010-10-21 02:21:24 +00:00
natural-law 0fa86461c8 modify the makefiles and submit the install project file(NinJia.TG3_IProc) 2010-10-18 08:54:19 +00:00
natural-law cd08895a64 issue #168 
reconstruct the SimpleAudioEngine
 2010-10-18 07:08:20 +00:00
natural-law d11e17e016 issue #168 
reconstruct the SimpleAudioEngine
 2010-10-18 07:07:55 +00:00
Walzer cddcb67f18 build to a statib lib on uphone 2010-10-18 02:34:09 +00:00
Walzer fec0e79545 UNDER_UPHONE -> CCX_UNDER_UPHONE 2010-10-16 08:50:48 +00:00
Walzer c76902c8bc UNDER_UPHONE -> CCX_UNDER_UPHONE 2010-10-16 08:28:28 +00:00
natural-law 723837d19c change background music player from SoundPlayer object to a pointer of SoundPlayer. 2010-10-16 08:25:09 +00:00
Walzer 507ca57b0e SimpleAudioEngine::getSharedSimpleAudioEngine -> getSharedEngine 2010-10-13 13:59:06 +00:00
natural-law ee773c13b2 issue #168 
back to the version for sdk 0925
 2010-10-13 08:46:33 +00:00
natural-law b093889436 issue #168 
complete the Audio Engine
 2010-10-13 06:18:03 +00:00
natural-law 6c1d28acb4 issue #168 
resolve the serious delay of play effect
 2010-10-12 07:55:56 +00:00
natural-law 7df52f2463 issue #168 2010-10-11 08:21:20 +00:00
natural-law 3f6e162ba7 issue #168 2010-10-09 02:47:09 +00:00
natural-law 6d658b341c issue #168 
the effect can be played and clear some memory leak
 2010-09-30 03:25:15 +00:00
natural-law 5f46a9b9ee issue #168 
implement SimpleAudioEngine and add a test project about SimpleAudioEngine
 2010-09-29 09:29:43 +00:00