MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into automelt

develop
eamondo2 2023-02-08 02:00:14 -05:00
parent be0cec9520 057d2d8c5d
commit 9925aba3e4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
Unescape Escape View File

@ -189,8 +189,8 @@ if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl
endif() endif()
# set up versioning. # set up versioning.
set(DF_VERSION "50.05") set(DF_VERSION "50.07")
set(DFHACK_RELEASE "alpha3.1") set(DFHACK_RELEASE "alpha0")
set(DFHACK_PRERELEASE TRUE) set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

4
library/lua/gui/widgets.lua
Unescape Escape View File

@ -1638,7 +1638,9 @@ end
function List:postComputeFrame(body) function List:postComputeFrame(body)
self.page_size = math.max(1, math.floor(body.height / self.row_height)) self.page_size = math.max(1, math.floor(body.height / self.row_height))
self.page_top = math.max(1, math.min(#self.choices - self.page_size + 1)) if #self.choices - self.page_size < 0 then
self.page_top = 1
end
update_list_scrollbar(self) update_list_scrollbar(self)
end end

2
library/xml

@ -1 +1 @@
Subproject commit 68f8bfa92b68ef9bc30da7f5a8ea5cf91f69ea16 Subproject commit e3c3d6a755de05c36bb7f2ac873d6ccb70410589

2
scripts

@ -1 +1 @@
Subproject commit 112d69ed3e0efb22e3ec6a6c8e58ad3135b80351 Subproject commit f969699a447fde05b0bd3397a8b1e2ce668bc54d