bc10c2a01f
Change some doc due to the change of source code.
...
Fixed some incorrect use of doxygen command.
2013-08-01 17:47:37 +08:00
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09:00
84d2bbe2b3
[Tizen] Re-add missing files for CocosDenshion.
2013-07-29 14:02:07 +08:00
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
295a23e535
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 07:57:28 +08:00
3ea77ec933
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 01:17:13 +03:00
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
00c2173009
Warning fix in CocosDenshion.vcxproj
2013-07-26 14:16:26 +08:00
6f4f8c0e38
Qt 5: System-wide installation of targets
2013-07-24 20:23:08 +02:00
485d973e24
Implement CocosDenshion backend using QMediaPlayer
...
Music and effect playback works, effect playback is not
totally low-latency; we could implement our own decoding
and mixing using QAudioDecoder and QAudioOutput to get
buffering, preloading, looping and latency working well.
2013-07-24 20:19:50 +02:00
4b52754dd3
CocosDenshion build setup for Qt 5 (no-op implementation)
...
Right now, all operations are implemented as no-op, but
libcocosdenshion can now be built as shared library and used.
2013-07-24 20:19:50 +02:00
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
382fe1a54d
Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.
2013-07-22 11:36:20 +08:00
8c182d257d
issue #2415 : Formating codes in SimpleAudioEngineOpenAL.cpp.
2013-07-22 10:43:23 +08:00
a60c3eaa20
closed #2415 : [OpenAL] Adding one line to delete SimpleAudioEngine singleton in SimpleAudioEngine::end().
2013-07-22 10:32:48 +08:00
604c30f102
Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers
...
Conflicts:
CocosDenshion/include/SimpleAudioEngine.h
samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
2013-07-22 10:06:14 +08:00
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
8078e8eff7
issue #2407 : SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().
2013-07-19 13:40:45 +08:00
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
c4ef2c9250
Added to various functions a check whether an OpenAL source exists on which OpenAL functions can be called.
...
Playback of background music starts now with the previously set volume, independent of the OpenAL source state.
Added a delete on the SimpleSoundEngine object within CocosDenshionTest::onExit() so that alutExit() gets called to release allocated resources by OpenAL.
2013-07-19 01:00:24 +02:00
c6c50eb55a
Merge pull request #3110 from sergey-shambir/opensl_fix
...
CocosDenshion: fixed wrong assertion in android OpenSL engine
2013-07-16 01:39:01 -07:00
3d23b65ad9
Changed the order of function calls within CocosDenshion::SimpleAudioEngine::end()
...
to first detach the OpenAL source from the buffers so that sound buffers can be successfully deleted afterwards.
Additionally, improved the documentation within the header file a little bit.
2013-07-14 17:27:00 +02:00
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
d853934f1b
Added -std=c++0x flag in C++ eclipse projects
2013-07-09 15:23:19 +02:00
3d3a628fb5
CocosDenshion: fixed wrong assertion in android OpenSL engine
...
Playback rate interface cannot be initialized for some players in
android 4.x, it's not cocos2d bug.
2013-07-09 08:49:02 +04:00
e5a80eed91
fixed conflict
2013-07-09 10:39:16 +08:00
6354b7e9c3
Fixed linux compilation bug in eclipse
2013-07-05 10:28:06 +02:00
0a2207f531
Fixed coding style, rearranged CocosDenshionTest UI, changed
...
rewindBackgroundMusic to work with paused music.
2013-06-29 13:46:19 +04:00
1c52517770
CocosDenshion: added effects customization for 7 platforms.
...
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.
Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
2013-06-29 13:44:16 +04:00
b9b36d7b56
CocosDenshion: (pitch/pan/gain) added Linux code for OpenAL and FMOD.
2013-06-29 13:44:08 +04:00
ab1038a540
pitch/pan/gain: added iOS/OSX impl, fixed compilation for all platforms.
2013-06-29 13:44:03 +04:00
b846a3060e
cocos2d-x in Mac:
...
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
2013-06-28 19:02:10 -07:00
ad7d606b48
Merge pull request #2703 from sergey-shambir/linux_qmake
...
close #2332 : [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
ef6f67902f
Adds mac workspace
...
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
7da2018128
issue #2325 : Adding armv7s architecture.
2013-06-24 17:06:25 +08:00
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
195605c85d
issue #2322 : Macro CC_DLL take no effect now since we are using static library.
2013-06-23 17:21:13 +08:00
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
0a0bada9c2
issue #2129 : Removing CC prefix for CocosDenshion module.
2013-06-20 14:12:43 +08:00
e89652e280
Merge pull request #2902 from waiter/master
...
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
2013-06-17 03:27:20 -07:00
4432caca1a
Fix a bug ( https://github.com/cocos2d/cocos2d-x/pull/2902 )
2013-06-17 15:54:50 +08:00
3921512739
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
2013-06-17 09:50:39 +08:00
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
Timothy Qiu