# HG changeset patch # User Wuzzy # Date 1538176635 -7200 # Node ID e3fee73c51a0f4f16a058c4042dd2dc9fa833e29 # Parent c0a7ef988151f1663fed6c41050936662f72d35f Move campaign mission images to share/ instead of hardcoding them into frontend Hardcoding campaign mission images prevented add-ons from adding their own preview images. diff -r c0a7ef988151 -r e3fee73c51a0 ChangeLog.txt --- a/ChangeLog.txt Thu Sep 27 00:26:58 2018 +0200 +++ b/ChangeLog.txt Sat Sep 29 01:17:15 2018 +0200 @@ -40,6 +40,7 @@ Frontend: + Add setting to disable audio dampening when losing window focus + Rework player rankings: Losing clans are now ranked in the reverse order they died + + Add-ons now support preview images for campaign missions * Fix player rankings on round draw: Clans that died in the same turn now have the same rank * Fix rare crash when aborting video encoding in progress * Fix critical failure to cleanup teams list after rejoining game under certain conditions diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/campaign.cpp --- a/QTfrontend/campaign.cpp Thu Sep 27 00:26:58 2018 +0200 +++ b/QTfrontend/campaign.cpp Sat Sep 29 01:17:15 2018 +0200 @@ -137,8 +137,8 @@ missionInfo.realName = m_info->value(scriptPrefix+".name", missionInfo.name).toString(); missionInfo.description = m_info->value(scriptPrefix + ".desc", QObject::tr("No description available")).toString(); - QString image = campfile.value(QString("Mission %1/Script").arg(i)).toString().replace(QString(".lua"),QString(".png")); - missionInfo.image = ":/res/campaign/"+campaignName+"/"+image; + QString image = campfile.value(QString("Mission %1/Script").arg(i)).toString().replace(QString(".lua"),QString("@2x.png")); + missionInfo.image = "physfs://Graphics/Missions/Campaign/"+campaignName+"/"+image; if (!QFile::exists(missionInfo.image)) missionInfo.image = ":/res/CampaignDefault.png"; missionInfoList.append(missionInfo); @@ -159,8 +159,8 @@ missionInfo.realName = m_info->value(scriptPrefix+".name", missionInfo.name).toString(); missionInfo.description = m_info->value(scriptPrefix + ".desc", QObject::tr("No description available")).toString(); - QString image = campfile.value(QString("Mission %1/Script").arg(missionNumber)).toString().replace(QString(".lua"),QString(".png")); - missionInfo.image = ":/res/campaign/"+campaignName+"/"+image; + QString image = campfile.value(QString("Mission %1/Script").arg(missionNumber)).toString().replace(QString(".lua"),QString("@2x.png")); + missionInfo.image = "physfs://Graphics/Missions/Campaign/"+campaignName+"/"+image; if (!QFile::exists(missionInfo.image)) missionInfo.image = ":/res/CampaignDefault.png"; missionInfoList.append(missionInfo); diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Thu Sep 27 00:26:58 2018 +0200 +++ b/QTfrontend/hedgewars.qrc Sat Sep 29 01:17:15 2018 +0200 @@ -35,30 +35,6 @@ res/botlevels/net3.png res/botlevels/net4.png res/botlevels/net5.png - res/campaign/A_Classic_Fairytale/first_blood.png - res/campaign/A_Classic_Fairytale/shadow.png - res/campaign/A_Classic_Fairytale/journey.png - res/campaign/A_Classic_Fairytale/united.png - res/campaign/A_Classic_Fairytale/backstab.png - res/campaign/A_Classic_Fairytale/dragon.png - res/campaign/A_Classic_Fairytale/family.png - res/campaign/A_Classic_Fairytale/queen.png - res/campaign/A_Classic_Fairytale/enemy.png - res/campaign/A_Classic_Fairytale/epil.png - res/campaign/A_Space_Adventure/cosmos.png - res/campaign/A_Space_Adventure/moon01.png - res/campaign/A_Space_Adventure/moon02.png - res/campaign/A_Space_Adventure/ice01.png - res/campaign/A_Space_Adventure/ice02.png - res/campaign/A_Space_Adventure/desert01.png - res/campaign/A_Space_Adventure/desert02.png - res/campaign/A_Space_Adventure/desert03.png - res/campaign/A_Space_Adventure/fruit01.png - res/campaign/A_Space_Adventure/fruit02.png - res/campaign/A_Space_Adventure/fruit03.png - res/campaign/A_Space_Adventure/death01.png - res/campaign/A_Space_Adventure/death02.png - res/campaign/A_Space_Adventure/final.png res/bonus.png res/Hedgehog.png res/net.png diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/backstab.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/backstab.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/dragon.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/dragon.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/enemy.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/enemy.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/epil.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/epil.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/family.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/family.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/first_blood.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/first_blood.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/journey.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/journey.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/queen.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/queen.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/shadow.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/shadow.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Classic_Fairytale/united.png Binary file QTfrontend/res/campaign/A_Classic_Fairytale/united.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/cosmos.png Binary file QTfrontend/res/campaign/A_Space_Adventure/cosmos.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/death01.png Binary file QTfrontend/res/campaign/A_Space_Adventure/death01.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/death02.png Binary file QTfrontend/res/campaign/A_Space_Adventure/death02.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/desert01.png Binary file QTfrontend/res/campaign/A_Space_Adventure/desert01.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/desert02.png Binary file QTfrontend/res/campaign/A_Space_Adventure/desert02.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/desert03.png Binary file QTfrontend/res/campaign/A_Space_Adventure/desert03.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/final.png Binary file QTfrontend/res/campaign/A_Space_Adventure/final.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/fruit01.png Binary file QTfrontend/res/campaign/A_Space_Adventure/fruit01.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/fruit02.png Binary file QTfrontend/res/campaign/A_Space_Adventure/fruit02.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/fruit03.png Binary file QTfrontend/res/campaign/A_Space_Adventure/fruit03.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/ice01.png Binary file QTfrontend/res/campaign/A_Space_Adventure/ice01.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/ice02.png Binary file QTfrontend/res/campaign/A_Space_Adventure/ice02.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/moon01.png Binary file QTfrontend/res/campaign/A_Space_Adventure/moon01.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/res/campaign/A_Space_Adventure/moon02.png Binary file QTfrontend/res/campaign/A_Space_Adventure/moon02.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 QTfrontend/ui/page/pagecampaign.cpp --- a/QTfrontend/ui/page/pagecampaign.cpp Thu Sep 27 00:26:58 2018 +0200 +++ b/QTfrontend/ui/page/pagecampaign.cpp Sat Sep 29 01:17:15 2018 +0200 @@ -46,7 +46,7 @@ infoLayout->setRowStretch(1, 1); // set this as default image first time page is created, this will change in hwform.cpp - btnPreview = formattedButton(":/res/campaign/A_Classic_Fairytale/first_blood.png", true); + btnPreview = formattedButton("physfs://Graphics/Missions/Campaign/A_Classic_Fairytale/first_blood@2x.png", true); btnPreview->setWhatsThis(tr("Start fighting")); infoLayout->setAlignment(btnPreview, Qt::AlignHCenter | Qt::AlignVCenter); diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/CMakeLists.txt --- a/share/hedgewars/Data/Graphics/Missions/CMakeLists.txt Thu Sep 27 00:26:58 2018 +0200 +++ b/share/hedgewars/Data/Graphics/Missions/CMakeLists.txt Sat Sep 29 01:17:15 2018 +0200 @@ -1,3 +1,4 @@ add_subdirectory(Training) add_subdirectory(Challenge) add_subdirectory(Scenario) +add_subdirectory(Campaign) diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/CMakeLists.txt Sat Sep 29 01:17:15 2018 +0200 @@ -0,0 +1,5 @@ +file(GLOB MissionPics *@2x.png) + +install(FILES + ${MissionPics} + DESTINATION ${SHAREPATH}Data/Graphics/Missions/Campaign/A_Classic_Fairytale) diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/backstab@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/backstab@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/dragon@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/dragon@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/enemy@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/enemy@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/epil@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/epil@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/family@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/family@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/first_blood@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/first_blood@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/journey@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/journey@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/queen@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/queen@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/shadow@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/shadow@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/united@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Classic_Fairytale/united@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/CMakeLists.txt Sat Sep 29 01:17:15 2018 +0200 @@ -0,0 +1,5 @@ +file(GLOB MissionPics *@2x.png) + +install(FILES + ${MissionPics} + DESTINATION ${SHAREPATH}Data/Graphics/Missions/Campaign/A_Space_Adventure) diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/cosmos@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/cosmos@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/death01@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/death01@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/death02@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/death02@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert01@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert01@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert02@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert02@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert03@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/desert03@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/final@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/final@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit01@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit01@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit02@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit02@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit03@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/fruit03@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/ice01@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/ice01@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/ice02@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/ice02@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/moon01@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/moon01@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/moon02@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Campaign/A_Space_Adventure/moon02@2x.png has changed diff -r c0a7ef988151 -r e3fee73c51a0 share/hedgewars/Data/Graphics/Missions/Campaign/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Graphics/Missions/Campaign/CMakeLists.txt Sat Sep 29 01:17:15 2018 +0200 @@ -0,0 +1,2 @@ +add_subdirectory(A_Classic_Fairytale) +add_subdirectory(A_Space_Adventure)