Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine

This commit is contained in:
samuele3hu 2014-10-22 17:07:18 +08:00
parent d29388eb30 b3288f7c27
commit 01e44c440c
9 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/android-build.py
View File

@ -204,9 +204,9 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
exit(1)
if build_mode is None:
build_mode = 'release'
elif build_mode != 'debug':
build_mode = 'release'
build_mode = 'debug'
elif build_mode != 'release':
build_mode = 'debug'
app_android_root = ''

6
cocos/audio/android/AudioEngine-inl.cpp
View File

@ -217,7 +217,7 @@ bool AudioEngineImpl::init()
return ret;
}
int AudioEngineImpl::play2d(const std::string &fileFullPath ,bool loop ,float volume)
int AudioEngineImpl::play2d(const std::string &filePath ,bool loop ,float volume)
{
auto audioId = AudioEngine::INVAILD_AUDIO_ID;
@ -227,10 +227,10 @@ int AudioEngineImpl::play2d(const std::string &fileFullPath ,bool loop ,float vo
break;
auto& player = _audioPlayers[currentAudioID];
auto initPlayer = player.init( _engineEngine, _outputMixObject, fileFullPath, volume, loop);
auto initPlayer = player.init( _engineEngine, _outputMixObject, FileUtils::getInstance()->fullPathForFilename(filePath), volume, loop);
if (!initPlayer){
_audioPlayers.erase(currentAudioID);
log("%s,%d message:create player for %s fail", __func__, __LINE__, fileFullPath.c_str());
log("%s,%d message:create player for %s fail", __func__, __LINE__, filePath.c_str());
break;
}

2
cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp
View File

@ -208,8 +208,6 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
void Timeline::updateCurrentKeyFrame(int frameIndex)
{
if(frameIndex > 60)
//! If play to current frame's front or back, then find current frame again
if (frameIndex < _currentKeyFrameIndex || frameIndex >= _currentKeyFrameIndex + _betweenDuration)
{

2
external/config.json vendored
View File

@ -1,6 +1,6 @@
{
"version":"v3-deps-20",
"zip_file_size":"88112898",
"zip_file_size":"87419231",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",
"move_dirs":{

4
templates/lua-template-runtime/.settings/version.json
View File

@ -1,4 +1,4 @@
{
"templateVersion":"1.4",
"runtimeVersion":"1.4"
"templateVersion":"1.5",
"runtimeVersion":"1.5"
}

2
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
View File

@ -68,7 +68,7 @@ extern string getIPAddress();
const char* getRuntimeVersion()
{
return "1.4";
return "1.5";
}
static string& replaceAll(string& str, const string& old_value, const string& new_value)

4
templates/lua-template-runtime/runtime/config.json
View File

@ -1,6 +1,6 @@
{
"version":"v3-lua-runtime-1.3.1",
"zip_file_size":"24660780",
"version":"v3-lua-runtime-1.5",
"zip_file_size":"30660780",
"repo_name":"cocos-runtime-bin",
"repo_parent":"https://github.com/chukong/"
}

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -145,7 +145,7 @@ g_guisTests[] =
}
},
{
"TextAtalsTest",
"TextAtlasTest",
[](Ref* sender)
{
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp
View File

@ -121,7 +121,7 @@ g_guisTests[] =
},
*/
{
"gui TextAtals Editor Test",
"gui TextAtlas Editor Test",
[](Ref* sender)
{
UISceneManager_Editor* pManager = UISceneManager_Editor::sharedUISceneManager_Editor();