pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
mustime
6beae122da
issue #1284 : fixed the problem that if the same effect is played for two
...
times, it will stop and restart
2012-08-02 14:28:40 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
minggo
7bfc88c568
Merge pull request #1130 from mustime/bug1284
...
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 20:31:51 -07:00
mustime
b4e7e1152f
issue #1284 : fix the problem that effect still plays after stop->resume
2012-07-27 10:36:05 +08:00
mustime
491c05b25c
issue #1284 : unify the static variables' name to s_pXX
2012-07-26 16:45:21 +08:00
mustime
2e335f6dee
issue #1284 : changed some names to make the code more readable
2012-07-26 16:22:23 +08:00
mustime
bfc53e3453
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 15:30:09 +08:00
James Chen
9a6729551c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399
2012-07-23 11:59:47 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
James Chen
7f6ffef8cf
issue #1399 : Set the flag 'LinkIncremental' value to false.
2012-07-23 11:47:27 +08:00
minggo
ac70f8def5
Merge branch 'gles20-adjust-structure' into merge
2012-07-23 11:36:46 +08:00
James Chen
baaf9dc930
issue #1399 : Renamed 'cocosDeshion' to 'CocosDeshion'.
2012-07-23 10:56:45 +08:00
Nat Weiss
d4b6d1262b
Adding Mac support!
2012-07-20 21:23:40 -07:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00
Nat Weiss
ee12785c6a
Fixes Win32 error "The application failed to initalize properly 0xc000000d"
2012-07-08 23:54:29 -07:00
minggo
16310cb544
fixed #1364:add paused state
2012-06-26 11:02:19 +08:00
minggo
5cc1f7d230
fixed #1338:stop animation when entering background and start animation when comming to foreground
2012-06-21 11:42:49 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
minggo
af9ada06af
fixed #iss1299_simpleaudioengine: can not reusme effect that not in paused state
2012-06-14 15:20:17 +08:00
minggo
77f51b5c48
issue #1310:synchronize CocosDenshion
2012-06-11 15:01:23 +08:00
James Chen
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
minggo
7e882ae89e
Merge pull request #879 from minggo/iss1201_android_build
...
simplify writing of Android.mk
2012-05-02 03:19:36 -07:00
James Chen
61f33a87af
fixed #1206 : Removed some unused files, first release will only support ios, win32 and android.
2012-05-02 14:50:47 +08:00
minggo
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
minggo
f37d3dd5d3
issue #1201 : simplify writing of Android.mk
2012-05-02 12:00:39 +08:00
Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
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
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
minggo
bfa8b65cc5
fixed #1028 : correct directory name
2012-03-08 10:09:17 +08:00
James Chen
fa72c65737
fixed #1008 : Missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform.
2012-03-04 11:25:01 +08:00
James Chen
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
James Chen
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
James Chen
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
James Chen
d0266f0064
refactor folder
2012-02-15 10:45:14 +08:00
James Chen
4fb9282569
move library to platform folders
2012-02-15 10:35:19 +08:00
James Chen
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
Dale Ducharme
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
dumganhar
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
dumganhar
4848dc9c46
fix a bug in SimpleAudioEngine.cpp on bada platform
...
use float value to change volume
2012-01-11 17:24:46 +08:00
dumganhar
92ea6596a3
use ceil function to set effect volume
2011-12-31 18:08:41 +08:00
dumganhar
82c978c34e
setEffectVolume, apply for all effect instance.
2011-12-31 17:53:01 +08:00
dumganhar
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
dumganhar
d6c18ab71c
fixed #927 : unloadEffect called after stopEffect will cause crash
2011-12-29 14:54:18 +08:00
minggo
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
minggo
3a3dcf736b
fixed 924: make cocosdenshion thread safe for preloading
2011-12-22 15:06:00 +08:00
dumganhar
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
gzito
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
minggo
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
minggo
0f5dd0dbb1
fixed #884 : make classOfCocos2dxActivity as a global reference
2011-12-19 15:00:51 +08:00
dumganhar
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
Didiet Noor
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +08:00
Didiet Noor
426bfdbdca
Removing static Resource Path on CocosDenshion for qnx
2011-12-14 16:23:18 +08:00
dumganhar
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
dumganhar
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dumganhar
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
minggo
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
gzito
cc2ad0c514
Added marmalade support, removed airplay
2011-12-11 10:24:38 +01:00
gzito
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
styck
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
dumganhar
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
dumganhar
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
Giovanni Zito
f1ab4893f6
Fixed isBackgroundMusicPlaying so that returns a bool value
2011-12-09 08:01:42 +01:00
dumganhar
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
Giovanni Zito
269efd0b74
Added support to play more than one sound fx at once
2011-12-08 19:26:44 +01:00
Giovanni Zito
0c1b058629
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:16:32 +01:00
dumganhar
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
Giovanni Zito
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
dumganhar
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
dumganhar
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
styck
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
dumganhar
520e3365c1
modify some project settings
2011-12-06 16:17:49 +08:00
dumganhar
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
dumganhar
5408fd1ee7
add CocosDenshion project for blackberry
2011-12-06 10:34:09 +08:00
dumganhar
4bdd70ab90
fixed #781 : Add functions for effects
2011-11-29 09:27:44 +08:00
dumganhar
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
dumganhar
5a1891087d
fixed #880 : support playeffect repeatly on bada.
2011-11-28 16:09:01 +08:00
dumganhar
55d9beb92e
issue #880 : playEffect repeatly can't work on bada platform
2011-11-28 15:49:37 +08:00
dumganhar
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
minggo
59f2ce10f2
issue #781 : implement audio functions on win32
2011-11-25 14:27:30 +08:00
minggo
89dbfee129
issue #781 : add sound functions on linux
2011-11-24 22:16:24 -08:00
minggo
7e61ce7d67
issue #781 : add audio functions on linux
2011-11-25 10:48:05 +08:00
minggo
bd595516b8
issue #781 : add new functions for sound
2011-11-25 09:56:06 +08:00
dumganhar
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
U-zhangxm-PC\zhangxm
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
dumganhar
ae8737cf7e
comment some log
2011-11-13 00:57:54 +08:00
Leon
83fcf18fcc
install correct fmod libs to /usr/local/lib
2011-11-09 18:47:14 +08:00
dumganhar
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
dumganhar
3b48a69d01
remove setResourcePath method
2011-11-07 14:19:46 +08:00
dumganhar
e9a2818d0d
use wvga setting, add SYSTEM_SERVICE
2011-11-02 01:11:06 +08:00
dumganhar
6bdf46cb00
fixed a bug in sort.c
2011-11-01 11:32:46 +08:00
dumganhar
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
dumganhar
853126036d
add ogg source for cocosDenshion project
2011-10-29 15:38:15 +08:00
dumganhar
fd90641c49
merge testf branch
2011-10-29 14:47:13 +08:00
Leon
59939218f5
add 64 bit fmodex for Linux
2011-10-28 15:43:44 +08:00
Leon
b7f0385a2b
bundle 64 bit linux static libs
2011-10-28 12:19:26 +08:00
dumganhar
d061e8323d
modify project configure
2011-10-27 19:22:14 +08:00
dumganhar
5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
dumganhar
a8f91669ce
modify CocosDenshion/proj.bada/sdk1.0/.badaprj
2011-10-25 17:53:39 +08:00
dumganhar
55d2e95845
modify project configure
2011-10-25 17:49:50 +08:00
dumganhar
4b653c89d1
modify project configure
2011-10-25 14:12:42 +08:00
dumganhar
bf4cbbdd35
use shared lib for cocosdenshion
2011-10-24 14:21:46 +08:00
dumganhar
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
laschweinski
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
laschweinski
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
dumganhar
c5b97d70e1
add __pAudioOut = null in construction function
2011-10-21 09:50:30 +08:00
dumganhar
eb901be664
project config change
2011-10-21 09:49:57 +08:00
dumganhar
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
dumganhar
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
dumganhar
ccbdf54c6d
if audio is playing, skip of it;
2011-10-20 13:49:01 +08:00
dumganhar
63e8fe156b
reset audio when audioout is interupted
2011-10-20 13:43:10 +08:00
dumganhar
707f2c2561
fix buffer count wrong
2011-10-19 17:15:21 +08:00
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