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

423 Commits

Author SHA1 Message Date
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
folecr f40fe3b028 Fix signature of Java method used in JNI 2013-08-05 02:05:46 -07:00
folecr c4fe5de7a4 cddandroidOpenSLEngine.h with updated method declaration 2013-08-05 02:05:45 -07:00
folecr c308d37a4b cddandroidOpenSLEngine.cpp with updated method declaration 2013-08-05 02:05:45 -07:00
folecr b01e27abc0 cddandroidAndroidJavaEngine.cpp with updated method declaration 2013-08-05 02:05:45 -07:00
folecr b8db689e3a cddandroidAndroidJavaEngine.h with updated method declaration 2013-08-05 02:05:45 -07:00
folecr 74c928bafc Empty implementation updated to match method declarations and getInstance() instead of sharedEngine() 2013-08-05 02:05:45 -07:00
folecr 8e897d1902 Use getInstance() instead of deprecated sharedFileUtils() 2013-08-05 02:05:45 -07:00
folecr ca8bc2ca4a Use Java audio for all devices while compatibility is tested. 2013-08-05 02:05:44 -07:00
folecr 2d7d918fa5 Set pointer to singleton instance to NULL after delete-ing it. 2013-08-05 02:05:44 -07:00
folecr f3141826b2 Remove unnecessary DeleteLocalRef (?) and clean up checking code 2013-08-05 02:05:44 -07:00
folecr 210cf68cab Remove OpenSL code. Add empty implementation for OpenSL Audio Engine. 2013-08-05 02:05:44 -07:00
folecr 3a7c5628c5 Empty implementation of SimpleAudioEngine to satisfy compiler. 2013-08-05 02:05:44 -07:00
folecr 1709a15b79 SimpleAudioEngine using Java helper class via JNI. 2013-08-05 02:05:44 -07:00
folecr 6a2b8ae271 Remove duplicate copy of jni utils. Remove old code. 2013-08-05 02:05:44 -07:00
folecr 7ead0522ab ::end() is implemented by deleting the object 2013-08-05 02:05:43 -07:00
folecr 4215565492 makefile modification to match rename 2013-08-05 02:05:43 -07:00
folecr 8c047b7217 Subclasses for Java and OpenSL variants of SimpleAudioEngine. SimpleAudioEngine factory chooses between the two. 2013-08-05 02:05:43 -07:00
folecr 10d9ea45fe Make methods in SimpleAudioEngine virtual 2013-08-05 02:05:43 -07:00
folecr 6750d9c51e Utility functions for Android CocosDenshion 2013-08-05 02:05:43 -07:00
folecr d0bacb8818 Clean up includes 2013-08-05 02:05:43 -07:00
folecr d70954d30f Remove copies of android system headers. 2013-08-05 02:05:42 -07:00
Timothy Qiu 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
Lee, Jae-Hong 4beeda2294 [Tizen] Fix compile error. 2013-07-30 15:43:05 +09:00
James Chen 84d2bbe2b3 [Tizen] Re-add missing files for CocosDenshion. 2013-07-29 14:02:07 +08:00
minggo 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
minggo 295a23e535 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 07:57:28 +08:00
Sergii Rudchenko 3ea77ec933 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 01:17:13 +03:00
Thomas Perl 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
James Chen 00c2173009 Warning fix in CocosDenshion.vcxproj 2013-07-26 14:16:26 +08:00
Thomas Perl 6f4f8c0e38 Qt 5: System-wide installation of targets 2013-07-24 20:23:08 +02:00
Thomas Perl 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
Thomas Perl 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
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
James Chen 382fe1a54d Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp. 2013-07-22 11:36:20 +08:00
James Chen 8c182d257d issue #2415: Formating codes in SimpleAudioEngineOpenAL.cpp. 2013-07-22 10:43:23 +08:00
James Chen a60c3eaa20 closed #2415: [OpenAL] Adding one line to delete SimpleAudioEngine singleton in SimpleAudioEngine::end(). 2013-07-22 10:32:48 +08:00
James Chen 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
James Chen 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
Lee, Jae-Hong 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
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
James Chen 8078e8eff7 issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance(). 2013-07-19 13:40:45 +08:00
Ricardo Quesada 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
rafael.x 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
minggo 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
rafael.x 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
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00