2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
bfa8b65cc5
fixed #1028 : correct directory name
2012-03-08 10:09:17 +08:00
fa72c65737
fixed #1008 : Missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform.
2012-03-04 11:25:01 +08:00
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
d0266f0064
refactor folder
2012-02-15 10:45:14 +08:00
4fb9282569
move library to platform folders
2012-02-15 10:35:19 +08:00
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
4848dc9c46
fix a bug in SimpleAudioEngine.cpp on bada platform
...
use float value to change volume
2012-01-11 17:24:46 +08:00
92ea6596a3
use ceil function to set effect volume
2011-12-31 18:08:41 +08:00
82c978c34e
setEffectVolume, apply for all effect instance.
2011-12-31 17:53:01 +08:00
4010733c20
fixed #927 : To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value.
2011-12-31 17:44:45 +08:00
d6c18ab71c
fixed #927 : unloadEffect called after stopEffect will cause crash
2011-12-29 14:54:18 +08:00
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
3a3dcf736b
fixed 924: make cocosdenshion thread safe for preloading
2011-12-22 15:06:00 +08:00
a8d5b6544a
Merge pull request #629 from gzito/master
...
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
2011-12-19 18:46:07 -08:00
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
a08ae8ef12
Merge pull request #627 from minggo/iss884_cocosdenshion
...
fixed #884 : make classOfCocos2dxActivity as a global reference
2011-12-19 00:06:08 -08:00
0f5dd0dbb1
fixed #884 : make classOfCocos2dxActivity as a global reference
2011-12-19 15:00:51 +08:00
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +08:00
426bfdbdca
Removing static Resource Path on CocosDenshion for qnx
2011-12-14 16:23:18 +08:00
4b9cbb85ff
#issue 908: Merge marmalade to latest cocos2d-x source
...
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dea2713f51
fixed #907 : add blackberry port
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
cc2ad0c514
Added marmalade support, removed airplay
2011-12-11 10:24:38 +01:00
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
5dea9b8205
fix a crash bug in SimpleAudioEngine.cpp
...
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
f1ab4893f6
Fixed isBackgroundMusicPlaying so that returns a bool value
2011-12-09 08:01:42 +01:00
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
269efd0b74
Added support to play more than one sound fx at once
2011-12-08 19:26:44 +01:00
0c1b058629
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:16:32 +01:00
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
96d400d918
Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
...
Refactored Accelerometer to match other platforms
Updated SimpleAudioEngine.cpp with new functions. (NOT tested).
Updated app.icf for latest Marmalade
Update deprecated function calls.
Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
520e3365c1
modify some project settings
2011-12-06 16:17:49 +08:00
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
5408fd1ee7
add CocosDenshion project for blackberry
2011-12-06 10:34:09 +08:00
4bdd70ab90
fixed #781 : Add functions for effects
2011-11-29 09:27:44 +08:00
3442d17dbe
fixed #880 : implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
2011-11-28 18:05:38 +08:00
5a1891087d
fixed #880 : support playeffect repeatly on bada.
2011-11-28 16:09:01 +08:00
55d9beb92e
issue #880 : playEffect repeatly can't work on bada platform
2011-11-28 15:49:37 +08:00
cad4ff05f3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
59f2ce10f2
issue #781 : implement audio functions on win32
2011-11-25 14:27:30 +08:00
89dbfee129
issue #781 : add sound functions on linux
2011-11-24 22:16:24 -08:00
7e61ce7d67
issue #781 : add audio functions on linux
2011-11-25 10:48:05 +08:00
bd595516b8
issue #781 : add new functions for sound
2011-11-25 09:56:06 +08:00
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
ae8737cf7e
comment some log
2011-11-13 00:57:54 +08:00
83fcf18fcc
install correct fmod libs to /usr/local/lib
2011-11-09 18:47:14 +08:00
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
3b48a69d01
remove setResourcePath method
2011-11-07 14:19:46 +08:00
e9a2818d0d
use wvga setting, add SYSTEM_SERVICE
2011-11-02 01:11:06 +08:00
6bdf46cb00
fixed a bug in sort.c
2011-11-01 11:32:46 +08:00
f43530c010
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
...
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
2011-10-31 09:34:40 +08:00
853126036d
add ogg source for cocosDenshion project
2011-10-29 15:38:15 +08:00
fd90641c49
merge testf branch
2011-10-29 14:47:13 +08:00
59939218f5
add 64 bit fmodex for Linux
2011-10-28 15:43:44 +08:00
b7f0385a2b
bundle 64 bit linux static libs
2011-10-28 12:19:26 +08:00
d061e8323d
modify project configure
2011-10-27 19:22:14 +08:00
5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
a8f91669ce
modify CocosDenshion/proj.bada/sdk1.0/.badaprj
2011-10-25 17:53:39 +08:00
55d2e95845
modify project configure
2011-10-25 17:49:50 +08:00
4b653c89d1
modify project configure
2011-10-25 14:12:42 +08:00
bf4cbbdd35
use shared lib for cocosdenshion
2011-10-24 14:21:46 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
c5b97d70e1
add __pAudioOut = null in construction function
2011-10-21 09:50:30 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
ccbdf54c6d
if audio is playing, skip of it;
2011-10-20 13:49:01 +08:00
63e8fe156b
reset audio when audioout is interupted
2011-10-20 13:43:10 +08:00
707f2c2561
fix buffer count wrong
2011-10-19 17:15:21 +08:00
a59fa1d596
use AudioOut to play effect
2011-10-18 18:10:53 +08:00
40cf322d60
don't use CCAudioOut
2011-10-18 11:11:36 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
e247668ee0
AudioOut support ogg format
2011-10-18 09:45:04 +08:00
80cd3266df
make HelloWorld and tests work ok on linux with eclipse
2011-10-16 02:21:17 -07:00
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
7d9ff2af6f
rename some files
2011-10-14 18:33:14 +08:00
eaad344762
resert some files
2011-10-14 17:57:44 +08:00
0086da0ee0
add link path & copy cocosdenshion depended libs into lib/linux/Debug
2011-10-14 02:30:49 -07:00
f1614fb4de
open media file succeed, insert list
2011-10-14 17:30:36 +08:00
f7bd325d2b
use Osp::Media::Player for playing effect
...
remove old AudioOut method
2011-10-14 16:03:06 +08:00
5fa24269b7
use Osp::Media::Player to playing effect.support mp3, aac, ...
2011-10-14 09:20:03 +08:00
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
f2ab09958f
add setResourcePath for SimpleAudioEngine
2011-09-29 22:53:38 +08:00
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
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
9991bc4d23
add some log in CocosDenshion
2011-09-28 22:53:51 +08:00
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
3859b7c39d
fixed #723 : remove unneeded files
2011-09-28 14:30:33 +08:00
446bd86fce
make HelloWorld and tests runs ok on linux
2011-09-27 22:56:06 -07:00
f896369ab5
add CocosDenshion project for bada 1.2 and 2.0
2011-09-28 09:52:35 +08:00
7cc86e741d
delete old cocosDenshion and tests project
2011-09-28 09:47:58 +08:00
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
4f7e349c0a
set HelloWorld dependence and make it run ok on android emulator
2011-09-26 22:38:59 -07:00
fce8ce5924
modify CocosDenshion and chipunk project setting for bada
2011-09-26 17:53:16 +08:00
0f7a15b1b3
recommit
...
modify eclipse project config
delete libs and use the folder eclipse generated instead.
2011-09-23 09:56:30 +08:00
1cac9520cc
make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion
2011-09-21 02:27:42 -07:00
eeb0956fb8
add linux makefiles
2011-09-20 14:38:12 +08:00
762e342b4d
fixed #727 : invoke DeleteLocalRef() to resolve memory leak
2011-09-20 14:25:16 +08:00
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
ca2027fbad
modify bada project
2011-09-19 23:35:46 +08:00
0e7fc78e4e
commit some files of bada project
2011-09-19 18:05:40 +08:00
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
8fbe6dcb3f
fixed #716 : don't convert effect volume to int
2011-09-13 14:10:32 +08:00
8f5c327937
add all eclipse project files to the corresponding directory
2011-09-07 12:44:03 +08:00
310e79a491
delete the project configurations in base folder
2011-09-07 12:41:39 +08:00
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
6347f878c2
fixed #662 , SimpleAudioEngine::playEffect() assertion bug on marmalade
2011-08-31 16:35:40 +08:00
28b1f317f4
Revert "First version of unloadBackgroundMusic for android - Feature #687 "
...
This reverts commit a157b775f8
2011-08-30 09:30:12 -03:00
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
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
a157b775f8
First version of unloadBackgroundMusic for android - Feature #687
2011-08-28 01:02:12 -03:00
3a0c2cb4fb
First version of a preloadBackgroundMusic for Android - Feature #687
2011-08-27 23:24:52 -03:00
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
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
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
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
52cdcbcbe4
fixed #633 add playeffect looply,in win32
2011-07-28 09:58:10 +08:00
1e8e036da7
issue #633 add playeffect loop in wophone
2011-07-26 17:04:39 +08:00
1bb9e8139a
issue 33: iOS & Android support looping playing effect
2011-07-26 15:52:41 +08:00
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
82f2104e69
fixed #583 modify SimpleAudioEngine resource path ,in win32
2011-07-08 16:49:19 +08:00
dead4cd717
fixed #593 CocosDenshion
2011-07-08 16:08:54 +08:00
3b6265aa58
Compile ok on vs2010
2011-06-27 17:02:58 +08:00
00568c229a
[android] back to shared library link
2011-06-25 11:21:16 +08:00
1584a96214
[win32] modify CocosDenshion project file to show correct in vs2008
2011-06-15 16:22:22 +08:00
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
dedbd638d3
lua runs ok on Android
2011-06-01 14:35:28 +08:00
6856ffc22c
Modify SoundPlayer.cpp for the last TMediaPlayer.so
2011-05-19 14:57:16 +08:00
e6c7d9fe63
fixed bug: The background music not stoped when app enter background some time.
2011-05-18 14:34:22 +08:00
846b529e49
[wophone] fixed #482 , Modify the resource data path for the new WoPhone-SDK.
2011-05-06 10:13:12 +08:00
cb65469103
[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk
2011-04-04 00:40:39 +08:00
6c2f66792f
issue #422 , add CocosDenshion implementation on airplay port. But it doesn't work correctly.
2011-03-31 17:53:35 +08:00
22b55eaf78
issue #418 : add copyright of original author to each file
2011-03-19 10:59:01 +08:00
795f1b985f
Add VC2010 project files on win32
2011-03-10 19:50:17 +08:00
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
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
90e8762cd5
fixed bug: tests::CocosDenshionTest can't exit program when music playing.
2011-01-24 14:31:51 +08:00
fe9c7a7be3
[win32] return float value of volume
2011-01-22 16:40:05 +08:00
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
dd979a4ed9
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-21 16:29:13 +08:00
b3fe7f5b6c
fixed #307:merge TestAudioEngine into tests
2011-01-21 16:26:51 +08:00
e92970ec69
[android] fixed #311 : implement cocosdenshin on android
2011-01-21 15:15:09 +08:00
dfad6ab9f9
change the interface of SimpleAudioEngine
2011-01-21 15:14:07 +08:00
3d225465c0
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
2011-01-20 13:41:58 +08:00
14fa024e48
Merge https://github.com/cocos2d/cocos2d-x into merger
2011-01-20 09:22:29 +08:00
e22ec58feb
[iphone] fix compilation error on SimpleAudioEngine::setResource(...)
2011-01-19 16:51:40 +08:00
d64ac9fdb8
issue #311 : cocosdenshion for android
2011-01-19 16:00:19 +08:00
ec7c24ad8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-19 10:03:39 +08:00
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
3a844f5527
[uphone] fix Makefile.ARM for CocosDenshion
2011-01-18 14:54:56 +08:00
acff950860
[uphone]fixed #315,remove the way which use resource in ResourceMap.
2011-01-14 17:42:37 +08:00
7efa234d53
issue 311: add some codes to support cocosdenshion on android, the implementation has not implemented
2011-01-12 11:49:54 +08:00
3072961d31
issue #310.Modify the SimpleAudioEngine in cocos2d-win32.
2011-01-11 17:01:06 +08:00
3d45614227
issue #310.Modify the SimpleAudioEngine in cocos2d-uphone.
2011-01-11 16:41:06 +08:00
221943fc26
rename SimpleAudioEngine::release() to SimpleAudioEngine::end()
2011-01-10 11:47:59 +08:00
dca85259b1
cocosdenshion ok on iphone
2011-01-10 11:39:34 +08:00
3712372cc8
issue #241 : add some files to support cocosdension for iphone
2011-01-08 13:41:27 +08:00
95e697d316
fixed #262 Add namespace for the project CocosDenshion.
2010-12-15 18:28:18 +08:00
9af3d2874d
fixed #261 Fix a bug of function SoundPlayer::PlaySoundFromMem().
2010-12-14 18:03:31 +08:00
0ab7e88f9f
fixed #249 implement read sound data from zip file in SimpleAudioEngine
2010-12-11 11:08:03 +08:00
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
b3bb3ce461
Merge branch 'iss228'
2010-11-30 14:37:35 +08:00
070439382e
fixed #228 Optimize function SimpleAudioEngine::stopBackgroundMusic
2010-11-30 14:37:11 +08:00
8128c1b322
issue #196 fix the bug in doxyen of SimpleAudioEngine
2010-11-29 22:17:30 +08:00
6c4d415173
fixed #221
2010-11-26 11:31:03 +08:00
852c57d2c6
add CCLOG support on win32 and uphone
2010-11-23 18:20:46 +08:00
5b7dc66817
debug
2010-11-19 07:22:21 +00:00
d96599e787
2010-11-19 02:48:08 +00:00
0ad77b779a
issue #211 don't checkout
2010-11-18 15:55:00 +00:00
26bfa32ca6
issue #211 don't check out
2010-11-18 14:56:54 +00:00
5a44e5f1fe
issue #211 don't checkout
2010-11-18 13:51:33 +00:00
79ed40ef38
issue #211 don't check out
2010-11-18 13:47:14 +00:00
6afe5752f2
rename directories
2010-11-18 12:32:01 +00:00
bba9049130
issue #186 uphone vs wizard build OK.
2010-11-18 07:46:59 +00:00
0a2567c646
SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine
2010-11-17 08:31:48 +00:00
b181701039
change win32 porject name
2010-11-17 02:46:43 +00:00
0618af9711
change win32 project name
2010-11-17 02:16:21 +00:00
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
f73ecd91bb
issue #196
...
add comment of SimpleAudioEngine code
2010-11-12 08:33:50 +00:00
70421ccc84
issue #168
...
debug
2010-11-12 03:48:51 +00:00
7e0b582ab0
issue #168
...
debug
2010-11-12 02:59:38 +00:00
85555c50d7
issue #168
...
debug
2010-11-12 02:58:19 +00:00
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +00:00
dba50b2693
fixed #180 implement SimpleAudioEngine using MCI. Support Midi and wave default.
2010-10-22 01:39:14 +00:00
0397ea0a74
issue #182
2010-10-21 06:44:02 +00:00
27f125cc77
issue #168
...
reconstruct the SimpleAudioEngine
2010-10-21 02:21:24 +00:00
0fa86461c8
modify the makefiles and submit the install project file(NinJia.TG3_IProc)
2010-10-18 08:54:19 +00:00
cd08895a64
issue #168
...
reconstruct the SimpleAudioEngine
2010-10-18 07:08:20 +00:00
d11e17e016
issue #168
...
reconstruct the SimpleAudioEngine
2010-10-18 07:07:55 +00:00
cddcb67f18
build to a statib lib on uphone
2010-10-18 02:34:09 +00:00
fec0e79545
UNDER_UPHONE -> CCX_UNDER_UPHONE
2010-10-16 08:50:48 +00:00
c76902c8bc
UNDER_UPHONE -> CCX_UNDER_UPHONE
2010-10-16 08:28:28 +00:00
723837d19c
change background music player from SoundPlayer object to a pointer of SoundPlayer.
2010-10-16 08:25:09 +00:00
507ca57b0e
SimpleAudioEngine::getSharedSimpleAudioEngine -> getSharedEngine
2010-10-13 13:59:06 +00:00
ee773c13b2
issue #168
...
back to the version for sdk 0925
2010-10-13 08:46:33 +00:00
b093889436
issue #168
...
complete the Audio Engine
2010-10-13 06:18:03 +00:00
6c1d28acb4
issue #168
...
resolve the serious delay of play effect
2010-10-12 07:55:56 +00:00
7df52f2463
issue #168
2010-10-11 08:21:20 +00:00
3f6e162ba7
issue #168
2010-10-09 02:47:09 +00:00
6d658b341c
issue #168
...
the effect can be played and clear some memory leak
2010-09-30 03:25:15 +00:00
5f46a9b9ee
issue #168
...
implement SimpleAudioEngine and add a test project about SimpleAudioEngine
2010-09-29 09:29:43 +00:00
Walzer