2ff42bb38e
V3 static analize fixes ( #18638 )
...
* fix different problems founded by static analize
* fix bad render assert
* Fix misprint
* reverted calloc in CCScheduler
2018-01-19 13:40:41 +08:00
4ca29ac1cf
Merge v3.15.1 ( #17897 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
* The optimization for huawei. (#17832 )
* The optimization for huawei.
* setAnimationInterval fix for all platforms.
* disable debug
* include fix.
* Uses better configuration for huawei optimization (#17838 )
* Uses better configuration for huawei optimization
* Updates jar file and uncomment fps controlling code
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840 )
* update release not and version (#17845 )
* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861 )
* Updates jar to resolve warning while packaging APK file. (#17863 )
* update release date (#17870 )
* fix compiling error
2017-06-05 13:37:50 +08:00
6217d8c5ca
fixed #17591 : [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback ( #17593 )
...
* Moves the implementation of AudioEngine::AudioInfo to cpp file.
* fixed #17591 : [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback
* fixed #17591 : Adds test case.
2017-03-27 17:28:39 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
777a97e141
Fix typo in AudioState ( #17258 )
2017-02-04 10:34:34 +08:00
208d39151e
Reverts create thread pool code, android doesn't need to create a thread pool in AudioEngine.cpp ( #17081 )
2016-12-29 10:22:45 +08:00
be43c4210f
Fixes crash that playing long audio and then uncacheAll ( #17079 )
...
* Fixes crash of playing long audio then uncacheAll.
* update
* Updates comments in MciPlayer.h
* tab -> 4spaces
* include path fix.
2016-12-29 10:05:13 +08:00
8af275c4a6
Fixes potential crash in AudioEngine::uncache(filePath). ( #16345 )
2016-08-11 16:06:59 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
40f6f76030
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
2015-11-26 22:22:05 -05:00
102020d831
1.AudioEngine:support callback for preload feature.
...
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
2015-07-28 15:27:07 +08:00
eca192f7a6
Fixed compile error
2015-07-10 14:43:28 +08:00
86a68f5a09
AudioEngine:refine thread pool
2015-07-09 14:31:03 +08:00
b395ef06d8
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
2015-07-08 10:48:20 +08:00
2db5a89b87
Added new audio engine with wav support
2015-05-15 18:17:52 -07:00
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
e20c347767
Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID
2014-12-31 20:51:45 -04:00
f52c3e5a83
Remove unneeded include in AudioEngine.h
2014-11-13 22:02:28 +08:00
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
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
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
f6992b94de
fix crash in AudioEngine
2014-09-14 22:48:41 +08:00
1d43c6ec82
Fix name of variables and coding style.
2014-09-10 17:12:46 +08:00
e588b371bd
Replace with 'struct' for AudioInfo/ProfileHelper.
2014-09-10 14:09:42 +08:00
e45a4ff1bd
1.Fix name of variables.
...
2.Fix control of volume on android.
2014-09-10 13:47:17 +08:00
f2b7bd62d5
update Xcode project for audio engine
2014-09-09 11:41:17 +08:00
1d900940ab
Refactoring API:
...
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 14:34:30 +08:00
6b4b5ed943
Refactoring API:
...
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 11:13:51 +08:00
fc9a0f9be9
Implement logical codes of new audio engine on IOS.
2014-09-03 18:19:21 +08:00
newnon