From b36711593bf4a84aaee452227220eae8906020e4 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 05:04:58 +0300 Subject: [PATCH 1/7] docs update --- doc/en/8.Scripting.md | 6 ++++++ doc/ru/8.Скриптинг.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/doc/en/8.Scripting.md b/doc/en/8.Scripting.md index 80126126..68b1e04b 100644 --- a/doc/en/8.Scripting.md +++ b/doc/en/8.Scripting.md @@ -278,6 +278,12 @@ Open block UI and inventory. Throws an exception if block has no UI layout. Returns block inventory ID (if *"inventory-size"=0* a virtual inventory will be created), and UI layout ID. +```python +hud.show_overlay(layoutid: str, playerinv: bool) +``` + +Show overlay with layout specified. Shows player inventory also if playerinv is **true** + > [!NOTE] > Only one block may be open at same time diff --git a/doc/ru/8.Скриптинг.md b/doc/ru/8.Скриптинг.md index 9f88954f..7d174252 100644 --- a/doc/ru/8.Скриптинг.md +++ b/doc/ru/8.Скриптинг.md @@ -271,6 +271,12 @@ hud.open_block(x: int, y: int, z: int) -> int, str Возвращает id инвентаря блока (при *"inventory-size"=0* создаётся виртуальный инвентарь, который удаляется после закрытия), и id макета UI. +```python +hud.show_overlay(layoutid: str, playerinv: bool) +``` + +Показывает элемент в режиме оверлея. Также показывает инвентарь игрока, если playerinv - **true** + > [!NOTE] > Одновременно может быть открыт только один блок From 23f8ab8a77b9ea3a34476c70b9c11367e85ffb6f Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 05:38:30 +0300 Subject: [PATCH 2/7] scissors fix --- src/graphics/GfxContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/graphics/GfxContext.cpp b/src/graphics/GfxContext.cpp index 57557942..da306fd4 100644 --- a/src/graphics/GfxContext.cpp +++ b/src/graphics/GfxContext.cpp @@ -15,16 +15,16 @@ GfxContext::GfxContext( {} GfxContext::~GfxContext() { + if (g2d) { + g2d->flush(); + } + while (scissorsCount--) { Window::popScissor(); } if (parent == nullptr) return; - - if (g2d) { - g2d->flush(); - } if (fbo != parent->fbo) { if (fbo) { From 789f3176d4c3ec4502fed7fa29a87b88c0bfa1e0 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 05:40:30 +0300 Subject: [PATCH 3/7] textbox render fix --- src/frontend/gui/controls.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp index 5ad500e4..b1bdb7fa 100644 --- a/src/frontend/gui/controls.cpp +++ b/src/frontend/gui/controls.cpp @@ -426,6 +426,9 @@ void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) { auto batch = pctx->getBatch2D(); batch->texture(nullptr); + auto subctx = pctx->sub(); + subctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y)); + if (valid) { if (isFocused() && !multiline) { batch->setColor(focusedColor); From de83b00332cf3633dd0beb5653ae5d219667fc37 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 07:08:54 +0300 Subject: [PATCH 4/7] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index bf2a6e18..47499cde 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Run with compiled executable file: -[Windows 64 bit](https://github.com/MihailRis/VoxelEngine-Cpp/releases/download/v19/voxelengine_v19_win64.zip) - -[Linux x86_64 (.AppImage)](https://github.com/MihailRis/VoxelEngine-Cpp/releases/download/v19/VoxelEngine-0.19-x86_64.AppImage) +[Download | Скачать](https://github.com/MihailRis/VoxelEngine-Cpp/releases/tag/v20.0) # Controls: From 2d191b84ce1f1af43fa46356c59124a6a651a2c2 Mon Sep 17 00:00:00 2001 From: rekvizitt <58174945+rekvizitt@users.noreply.github.com> Date: Sat, 16 Mar 2024 13:19:51 +0300 Subject: [PATCH 5/7] Update be_BY.txt added translation for audio options --- res/texts/be_BY.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/res/texts/be_BY.txt b/res/texts/be_BY.txt index 1128ebde..c208eeaf 100644 --- a/res/texts/be_BY.txt +++ b/res/texts/be_BY.txt @@ -23,6 +23,7 @@ menu.Controls=Кіраванне menu.Back to Main Menu=Вярнуцца ў Меню menu.Settings=Налады menu.Content=Кантэнт +menu.Audio=Гук world.Seed=Зерне world.Name=Назва @@ -41,6 +42,11 @@ settings.Fog Curve=Крывая Туману settings.Backlight=Падсветка settings.V-Sync=Вертыкальная Сінхранізацыя settings.Camera Shaking=Труска Камеры +settings.Master Volume=Агульная Гучнасць +settings.Regular Sounds=Звычайныя Гукі +settings.UI Sounds=Гукі Інтэрфейсу +settings.Ambient=Фон +settings.Music=Музыка settings.FOV=Поле Зроку settings.Mouse Sensitivity=Адчувальнасць Мышы From 653437a5b2ef4bc28cb832376764faee3c73f481 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 13:35:41 +0300 Subject: [PATCH 6/7] translation corrected --- res/texts/uk_UA.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/texts/uk_UA.txt b/res/texts/uk_UA.txt index ddc657ae..4030d650 100644 --- a/res/texts/uk_UA.txt +++ b/res/texts/uk_UA.txt @@ -22,7 +22,7 @@ world.Seed=Зерно world.Name=Назва menu.Create World=Створити Світ -world.World generator=Генератор світла +world.World generator=Генератор світу world.generators.default=Звичайні world.generators.flat=Плоскі world.convert-request=Є зміни в індексах! Конвертувати світ? From 71d6e60d9a51e6e6631d5c9f8ad6b1b27100b234 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 16 Mar 2024 15:50:34 +0300 Subject: [PATCH 7/7] relative sounds fix --- src/logic/scripting/lua/libaudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp index 66a52f1e..1a786692 100644 --- a/src/logic/scripting/lua/libaudio.cpp +++ b/src/logic/scripting/lua/libaudio.cpp @@ -42,7 +42,7 @@ inline audio::speakerid_t play_sound( static_cast(y), static_cast(z) ), - false, + relative, volume, pitch, false,