From 986d5221b1d1fc49756474b86d01a1ec31248038 Mon Sep 17 00:00:00 2001 From: gabrieljamh Date: Sat, 16 Mar 2024 16:01:47 +0100 Subject: [PATCH 1/6] Translated using Weblate (Portuguese (Brazil)) Currently translated at 10.5% (20 of 190 strings) Translations: Weblate side updates (Portuguese (Brazil)) Currently translated at 57.3% (1223 of 2131 strings) Co-authored-by: gabrieljamh Translate-URL: https://hosted.weblate.org/projects/moondust-project/calibrator/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/moondust-project/editor/pt_BR/ Translation: Moondust Project/Calibrator Translation: Moondust Project/Editor --- Editor/languages/editor_pt-br.ts | 2 +- .../languages/calibrator_pt-br.ts | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Editor/languages/editor_pt-br.ts b/Editor/languages/editor_pt-br.ts index de70ebe6a..545ffd1cd 100644 --- a/Editor/languages/editor_pt-br.ts +++ b/Editor/languages/editor_pt-br.ts @@ -2419,7 +2419,7 @@ So, please break these words to avoid this.</li> Right - Esquerda + Direita Remove diff --git a/PlayableCalibrator/languages/calibrator_pt-br.ts b/PlayableCalibrator/languages/calibrator_pt-br.ts index b5c5fc0e9..046ebe625 100644 --- a/PlayableCalibrator/languages/calibrator_pt-br.ts +++ b/PlayableCalibrator/languages/calibrator_pt-br.ts @@ -6,24 +6,24 @@ Animation editor - + Editor de animações Add - + Adicionar Preview - + Pré-visualizar Animation name - + Nome da animmação @@ -34,14 +34,14 @@ Set - + Definir Del - + Apagar @@ -71,22 +71,22 @@ Empty animation name - + Nome da animação vazio Animation name is empty! - + O nome da animação esta vazio! Animation exist - + Animação existente Animation with '%1' name already exist! - + Uma animação com o nome'%1' já existe! @@ -94,37 +94,37 @@ Animator - + Animador Direction - + Direção Left - + Esquerda Right - + Direita Edit animations - + Editar animações Frame speed: - + Velocidade do Frame: Animation - + Animação @@ -132,22 +132,22 @@ Height - + Altura Offset relative to player's back (don't forget to set left or right direction to define source side) - + Deslocamento relativo a costa do jogador (escolha Esquerda ou Direita para o lado da origem) Width - + Largura Width of player's collision box (hitbox) - + Largura da caixa de colisão do jogador (hitbox) From ba165aafc3cb5d43036a0ae3afb6e9ba4c77ef91 Mon Sep 17 00:00:00 2001 From: gabrieljamh Date: Sat, 16 Mar 2024 16:02:00 +0100 Subject: [PATCH 2/6] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1 of 1 strings) Co-authored-by: gabrieljamh Translate-URL: https://hosted.weblate.org/projects/moondust-project/glossary/pt_BR/ Translation: Moondust Project/Moondust Project --- _Misc/glossary/pt_BR.tbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Misc/glossary/pt_BR.tbx b/_Misc/glossary/pt_BR.tbx index 8f39888db..8ba259140 100644 --- a/_Misc/glossary/pt_BR.tbx +++ b/_Misc/glossary/pt_BR.tbx @@ -12,7 +12,7 @@ Moondust - + Moondust From 922bc5d8803e0cf5a1575a925d372f8128c69a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=8E=E6=98=A5=E5=BF=83=E6=83=85?= Date: Sun, 31 Mar 2024 03:01:34 +0200 Subject: [PATCH 3/6] Translations: Weblate side updates (Chinese (Simplified)) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (2131 of 2131 strings) Co-authored-by: 迎春心情 Translate-URL: https://hosted.weblate.org/projects/moondust-project/editor/zh_Hans/ Translation: Moondust Project/Editor --- Editor/languages/editor_zh.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Editor/languages/editor_zh.ts b/Editor/languages/editor_zh.ts index 83c976d00..9e615eb09 100644 --- a/Editor/languages/editor_zh.ts +++ b/Editor/languages/editor_zh.ts @@ -4539,7 +4539,7 @@ to enter this warp If this setting is enabled, even if this warp leads to another level, the number of existing and collected stars in the level will not be shown. - 启用此设置后，将不显示已收集 + 勾选此项后，将不显示已收集 的星星数量和总星星数量。 @@ -4667,8 +4667,8 @@ Measured in pixels per 1/65 seconds. Target coordinates of player on the world map when you exit from a level through this warp. - 玩家在大地图上的目标坐标 -当您通过此扭曲从关卡退出时。 + 通过传送点离开关卡时 +玩家所在的大地图位置。 Y: @@ -4690,7 +4690,7 @@ when you exit from a level through this warp. Entering this warp ends the current level If this flag is enabled, you can only place a warp entrance. 进入此传送点时过关。 -如果开启此选项，您只能放置入口点。 +如果勾选此选项，您只能放置入口点。 To other level @@ -4703,7 +4703,7 @@ If this flag is enabled, you can only place a warp exit. 翻译的不怎么样…… 防止进入此传送点时使用此出口点。 用于传送到另一关卡。 -如果开启此选项，您只能放置出口点。 +如果勾选此选项，您只能放置出口点。 From other level From 3533b18748cefa2b0298225fb5d73424b638ced5 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 29 Apr 2024 03:30:18 +0300 Subject: [PATCH 4/6] Editor: Attempt to resolve the abnormal item picker behaviour --- Editor/main_window/dock/lvl_item_properties.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Editor/main_window/dock/lvl_item_properties.cpp b/Editor/main_window/dock/lvl_item_properties.cpp index 20b9db254..dd8619323 100644 --- a/Editor/main_window/dock/lvl_item_properties.cpp +++ b/Editor/main_window/dock/lvl_item_properties.cpp @@ -2106,14 +2106,16 @@ void LvlItemProperties::on_PROPS_NPCSpecialSpin_Auto_toggled(bool checked) void LvlItemProperties::processNpcContainerButton(QPushButton *btn) { int npcID = 0; + bool isLevelWindow = mw()->activeChildWindow() == MainWindow::WND_Level; + LevelEdit *edit = mw()->activeLvlEditWin(); if(m_currentNpcArrayId < 0) { npcID = int(LvlPlacingItems::npcSet.contents); } - else if(mw()->activeChildWindow() == MainWindow::WND_Level) + else if(isLevelWindow) { - QList items1 = mw()->activeLvlEditWin()->scene->selectedItems(); + QList items1 = edit->scene->selectedItems(); for(QGraphicsItem *targetItem : items1) { if((targetItem->data(ITEM_TYPE).toString() == "NPC") && ((targetItem->data(ITEM_ARRAY_ID).toInt() == m_currentNpcArrayId))) @@ -2126,6 +2128,7 @@ void LvlItemProperties::processNpcContainerButton(QPushButton *btn) ItemSelectDialog *npcList = new ItemSelectDialog(&mw()->configs, ItemSelectDialog::TAB_NPC, 0, 0, 0, npcID, 0, 0, 0, 0, 0, this); util::DialogToCenter(npcList, true); + if(npcList->exec() == QDialog::Accepted) { int selected_npc = npcList->npcID; @@ -2150,13 +2153,14 @@ void LvlItemProperties::processNpcContainerButton(QPushButton *btn) g_intEngine.sendPlacingNPC(LvlPlacingItems::npcSet); } } - else if(mw()->activeChildWindow() == MainWindow::WND_Level) + else if(isLevelWindow) { + Q_ASSERT(edit); LevelData selData; LevelNPC npc; - LevelEdit *edit = mw()->activeLvlEditWin(); QList items = edit->scene->selectedItems(); edit->LvlData.meta.modified = true; + for(auto *item : items) { if((item->data(ITEM_TYPE).toString() == "NPC")/*&&((item->data(ITEM_ARRAY_ID).toInt()==blockPtr))*/) @@ -2170,17 +2174,20 @@ void LvlItemProperties::processNpcContainerButton(QPushButton *btn) npc = npcI->m_data; } } + edit->scene->m_history->addChangeSettings(selData, ((ui->PROPS_NPCContaiter == btn) ? HistorySettings::SETTING_CHANGENPC : HistorySettings::SETTING_SPECIAL_DATA), QVariant(selected_npc)); - m_internalLock = true; + + m_internalLock = true; if(items.size() > 0) refreshFirstNpcSpecialOption(npc); m_internalLock = false; } } + delete npcList; } From e4b260163ff34392e181707621edf9665e341eb2 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 29 Apr 2024 21:41:02 +0300 Subject: [PATCH 5/6] CI: Attempt to fix the macOS build --- .github/workflows/macos-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 8daf7a4e4..05ac5584d 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -19,7 +19,7 @@ jobs: config: - { name: "x86_64", - os: macos-latest, + os: macos-latest-large, extra_path: "/Users/StaticQt/5.14.2/bin", build_type: "Release", upload_directory: "www/macosx/", From 045dece9ebedf2f3e6e7d5ce5975b0fe22349ffa Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 29 Apr 2024 22:09:56 +0300 Subject: [PATCH 6/6] CI: Another attempt to fix the macOS CI --- .github/workflows/macos-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 05ac5584d..743525807 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -19,7 +19,7 @@ jobs: config: - { name: "x86_64", - os: macos-latest-large, + os: macos-13, extra_path: "/Users/StaticQt/5.14.2/bin", build_type: "Release", upload_directory: "www/macosx/",