diff --git a/src/client/Input.cpp b/src/client/Input.cpp index a746982e..ad8915bb 100644 --- a/src/client/Input.cpp +++ b/src/client/Input.cpp @@ -45,9 +45,9 @@ bool Input::isMouseDown(u32 button) { void Input::setMouseLocked(bool lock) { forceMouseUnlocked = !lock; mouseLocked = lock; - let mousePos = static_cast(glfwGetWindowUserPointer(window))->getSize() / 2; - glfwSetCursorPos(window, mousePos.x, mousePos.y); + ivec2 mousePos = static_cast(glfwGetWindowUserPointer(window))->getSize() / 2; glfwSetInputMode(window, GLFW_CURSOR, (mouseLocked ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_NORMAL)); + glfwSetCursorPos(window, lock ? LOCKED_MOUSE_POS.x : mousePos.x, lock ? LOCKED_MOUSE_POS.y : mousePos.y); } ivec2 Input::getMousePos() { diff --git a/subgames/zeus/mods/auri_chat/script/gui.lua b/subgames/zeus/mods/auri_chat/script/gui.lua index 11eb8a23..fb46ccf9 100644 --- a/subgames/zeus/mods/auri_chat/script/gui.lua +++ b/subgames/zeus/mods/auri_chat/script/gui.lua @@ -45,7 +45,7 @@ chat._refresh = function() local i = 0 for _, identifier in ipairs(chat.channel_order) do local channel = chat.channels[identifier] - chat_menu_tabs:append(Gui.Box { + chat_menu_tabs:append(zepha.Gui.Box { size = { '48dp', '10dp' }, pos = { i * 49 .. 'dp', '0dp' }, background = (chat.current_channel == identifier) and '#0005' or '#0002', diff --git a/subgames/zeus/mods/zeus_default/textures/dirt.png b/subgames/zeus/mods/zeus_default/textures/dirt.png index 324ee52d..23c11e77 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/dirt.png and b/subgames/zeus/mods/zeus_default/textures/dirt.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png b/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png index 595b8eee..7cb1dcaf 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png and b/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/grass_side_under.png b/subgames/zeus/mods/zeus_default/textures/grass_side_under.png index 192d211a..4bb8091a 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/grass_side_under.png and b/subgames/zeus/mods/zeus_default/textures/grass_side_under.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/grass_side_under_mask.png b/subgames/zeus/mods/zeus_default/textures/grass_side_under_mask.png index a9202976..32da1c8a 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/grass_side_under_mask.png and b/subgames/zeus/mods/zeus_default/textures/grass_side_under_mask.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/leaves.png b/subgames/zeus/mods/zeus_default/textures/leaves.png index 8366d940..8022bf53 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/leaves.png and b/subgames/zeus/mods/zeus_default/textures/leaves.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/leaves_puff.png b/subgames/zeus/mods/zeus_default/textures/leaves_puff.png index c9d011dc..bb717cea 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/leaves_puff.png and b/subgames/zeus/mods/zeus_default/textures/leaves_puff.png differ diff --git a/subgames/zeus/mods/zeus_default/textures/stone.png b/subgames/zeus/mods/zeus_default/textures/stone.png index 48460ce1..9ba71abe 100644 Binary files a/subgames/zeus/mods/zeus_default/textures/stone.png and b/subgames/zeus/mods/zeus_default/textures/stone.png differ diff --git a/subgames/zeus/mods/zeus_world/script/biomes/plains.lua b/subgames/zeus/mods/zeus_world/script/biomes/plains.lua index 8c4d740c..3ff06c61 100644 --- a/subgames/zeus/mods/zeus_world/script/biomes/plains.lua +++ b/subgames/zeus/mods/zeus_world/script/biomes/plains.lua @@ -1,6 +1,6 @@ local identifier = "zeus:world:plains" -local wood = "zeus:default:wood" +local wood = "zeus:default:bush_stem" local leaf = "zeus:default:leaves" local none = "invalid" @@ -93,13 +93,13 @@ table.insert(structures, zepha.create_structure({ origin = V(2, 2, 2), probability = 0.0005, layout = { - trunk_layer_0, - trunk_layer_0, - trunk_layer_0, - trunk_layer_0, - trunk_layer_1, - trunk_layer_1, - trunk_layer_1, +-- trunk_layer_0, +-- trunk_layer_0, +-- trunk_layer_0, +-- trunk_layer_0, +-- trunk_layer_1, +-- trunk_layer_1, +-- trunk_layer_1, trunk_layer_2, trunk_layer_2, trunk_layer_2, @@ -128,7 +128,7 @@ for i = 1, 5 do layout = {{{ "zeus:default:tall_grass_" .. tostring(i) }}} })) end --- + table.insert(structures, zepha.create_structure({ origin = V(), probability = 0.025, @@ -200,7 +200,7 @@ zepha.register_biome(identifier, { }, tags = { natural = 1, default = 1 }, structures = structures, - biome_tint = "#aaed45", + biome_tint = "#6effee", noise = noise })