Ricardo Quesada
|
2e3b2d9f28
|
Merge pull request #9080 from vovkasm/cmake-refactoring
Cmake refactorings and fixes
|
2014-11-13 15:42:47 -08:00 |
Dhilan007
|
249d34b707
|
fix AudioEngine can't looping audio on Android 2.3.x
|
2014-11-13 11:28:08 +08:00 |
Vladimir Timofeev
|
8910b962a0
|
cmake:
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
|
2014-11-11 10:30:48 +03:00 |
Dhilan007
|
c66348435c
|
Fixed incorrect file path of audio resource in AudioEngine on Android.
|
2014-10-21 18:34:05 +08:00 |
Dale Stammen
|
52fc6d618b
|
updated for Windows 8.1
|
2014-10-14 14:13:14 -07:00 |
Dale Stammen
|
fd638f00b7
|
removed old WP8 project files
|
2014-10-14 14:09:52 -07:00 |
martell
|
73980195c0
|
wp8: use CC_STATIC because libs are static
|
2014-10-09 06:33:46 +01:00 |
martell
|
c3172bef50
|
Finalise Windows cmake support for mingw-w64
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:09 +01:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
martell
|
fe32bcb952
|
added support for static and shared builds with audio and studio
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:20:52 +01:00 |
Ricardo Quesada
|
342d934a0e
|
scheduler and macro fixes
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
|
2014-10-03 09:38:36 -07:00 |
minggo
|
2ecfcee2a6
|
Merge pull request #8216 from Dhilan007/v3-audio-fix
fix audio issues(log output:Too Many Objects) after play audio many times on Android
|
2014-09-30 15:19:46 +08:00 |
Dhilan007
|
ed9c8b2693
|
fix audio issues(log output:Too Many Objects) after play audio many times.
|
2014-09-30 15:00:52 +08:00 |
Dhilan007
|
02fcb6488a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
|
2014-09-30 14:19:27 +08:00 |
minggo
|
804b26344e
|
fix warnings
|
2014-09-30 11:58:38 +08:00 |
Dhilan007
|
db45794625
|
fix macro
|
2014-09-30 09:57:28 +08:00 |
Dhilan007
|
18307d52da
|
fix macro
|
2014-09-30 09:48:24 +08:00 |
Dhilan007
|
7ebe4a5548
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
|
2014-09-30 09:45:47 +08:00 |
Ricardo Quesada
|
7a1dac5aa6
|
Fixes audio issues when using CMake on Mac
|
2014-09-29 14:07:11 -03:00 |
Dhilan007
|
65a14a6d3f
|
Improved thread safety
|
2014-09-29 14:17:51 +08:00 |
Dhilan007
|
f2f1331026
|
New Audio Engine[Win32]
|
2014-09-29 10:15:41 +08:00 |
Dhilan007
|
c37371a543
|
fix noise on mac
|
2014-09-22 16:59:24 +08:00 |
Dhilan007
|
936c3b3f79
|
New Audio Engine -MAC
|
2014-09-22 15:38:12 +08:00 |
Dhilan007
|
369c14ed49
|
fix compile error
|
2014-09-16 14:57:58 +08:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
Dhilan007
|
39a8b8d5ea
|
Fix a potential crash in AudioEngine on Android.
|
2014-09-15 17:36:00 +08:00 |
minggo
|
68ab3082b4
|
fix warnings
|
2014-09-15 16:23:57 +08:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
minggo
|
6bcab3b05d
|
Merge pull request #7920 from rny/audio_win32
win32 can not stop looping sound effect
|
2014-09-15 09:37:11 +08:00 |
Dhilan007
|
f6992b94de
|
fix crash in AudioEngine
|
2014-09-14 22:48:41 +08:00 |
Dhilan007
|
518fd7ab6f
|
Optimized seek for large file and log output on IOS.
|
2014-09-11 10:53:01 +08:00 |
Dhilan007
|
1d43c6ec82
|
Fix name of variables and coding style.
|
2014-09-10 17:12:46 +08:00 |
Dhilan007
|
fc27c5e32a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-09-10 14:35:33 +08:00 |
Dhilan007
|
e588b371bd
|
Replace with 'struct' for AudioInfo/ProfileHelper.
|
2014-09-10 14:09:42 +08:00 |
Dhilan007
|
e45a4ff1bd
|
1.Fix name of variables.
2.Fix control of volume on android.
|
2014-09-10 13:47:17 +08:00 |
Ricardo Quesada
|
4d57e991ea
|
Compiles in Win32
|
2014-09-09 18:07:24 -07:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
Dhilan007
|
f2b7bd62d5
|
update Xcode project for audio engine
|
2014-09-09 11:41:17 +08:00 |
Dhilan007
|
1d900940ab
|
Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
|
2014-09-05 14:34:30 +08:00 |
Dhilan007
|
6b4b5ed943
|
Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
|
2014-09-05 11:13:51 +08:00 |
Dhilan007
|
d5c023740f
|
Implement logical codes of new audio engine on android.
|
2014-09-03 18:19:47 +08:00 |
Dhilan007
|
fc9a0f9be9
|
Implement logical codes of new audio engine on IOS.
|
2014-09-03 18:19:21 +08:00 |
Dhilan007
|
ca652cefee
|
New audio engine API[2d]
|
2014-09-03 18:18:47 +08:00 |
Ningyu
|
1df8d423d0
|
win32 can not stop looping sound effect
|
2014-09-01 15:03:57 +08:00 |
Ricardo Quesada
|
2c068cd1f5
|
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
Adds MARK: TODO: FIXME: in code
|
2014-08-29 12:55:14 -07:00 |
Ricardo Quesada
|
c149bfca00
|
Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
|
2014-08-29 12:54:24 -07:00 |
minggo
|
3679d66c8e
|
remove unneeded includes
|
2014-08-29 15:39:52 +08:00 |
minggo
|
d3ce2acff6
|
Merge pull request #7892 from Dhilan007/v3-androidmk
Adjust android.mk for cocos2d and related module
|
2014-08-28 10:16:39 +08:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
samuele3hu
|
3d5f8de346
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 20:58:32 +08:00 |