pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/audio/winrt/Audio.cpp cocos/platform/winrt/CCCommon.cpp cocos/platform/winrt/CCWinRTUtils.cpp cocos/platform/winrt/CCWinRTUtils.h		2015-08-27 10:40:04 +08:00
..
Audio.cpp	fixed for winrt audio issue 13254	2015-08-21 09:59:46 -07:00
Audio.h	fixed for winrt audio issue 13254	2015-08-21 09:59:46 -07:00
AudioCachePlayer.cpp	Correct use and convert unicode from utf8	2015-08-16 12:51:41 +03:00
AudioCachePlayer.h	1.AudioEngine:support callback for preload feature.	2015-07-28 15:27:07 +08:00
AudioEngine-winrt.cpp	Add getFileExtension to FileUtils	2015-08-05 22:21:16 +03:00
AudioEngine-winrt.h	1.AudioEngine:support callback for preload feature.	2015-07-28 15:27:07 +08:00
AudioSourceReader.cpp	Correct use and convert unicode from utf8	2015-08-16 12:51:41 +03:00
AudioSourceReader.h	Added ogg support to audio engine. Fixed issues #150 and #151	2015-06-03 20:57:14 -07:00
MediaStreamer.cpp	Added MP3 support	2015-05-23 19:13:12 -07:00
MediaStreamer.h	Added new audio engine with wav support	2015-05-15 18:17:52 -07:00
SimpleAudioEngine.cpp	fix deprecated method	2015-05-21 13:30:51 -07:00