Commit Graph

4183 Commits (73f8186ab7561e20f837c999fad67b5ea0423cd6)

Author SHA1 Message Date
Taxi Service cfcb1cd937 make val_sep useful if label_below == true 2023-04-30 10:18:15 +02:00
Myk Taylor 923f84b2f2
bump to 50.08-r1 2023-04-29 18:58:34 -07:00
Myk Taylor f61d25bdeb
bump to 50.08-r1 2023-04-29 18:46:13 -07:00
Myk b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal 2023-04-26 15:48:13 -07:00
Myk Taylor 6d3e5f3a1a
Merge branch 'develop' into 5008-beta1 2023-04-26 12:34:01 -07:00
Taxi Service 48ffad2f71 added and attributes to 2023-04-26 01:02:38 +02:00
Myk Taylor e4d84e50e8
Merge branch 'develop' into 5008-beta1 2023-04-24 15:43:32 -07:00
Myk Taylor 65d7b290a3
add ZScreenModal class for modal dialogs 2023-04-24 14:32:33 -07:00
Myk Taylor 73b5e37f67
simplify loops with foreach syntax 2023-04-24 14:28:47 -07:00
Myk Taylor 5a4dec35f1
reorder template declarations so we can push vectors of maps 2023-04-24 14:28:21 -07:00
Myk 2a410f7570
Merge pull request #3294 from myk002/myk_title_version
add DFHack title version overlay
2023-04-24 14:13:53 -07:00
Myk Taylor 6203894c99
add title screen focus string detection 2023-04-24 08:03:11 -07:00
Myk Taylor b5459faffe
format version string in help the same way 2023-04-23 18:20:50 -07:00
Kelly Kinkade 2b8b6a62e0 update structures 2023-04-21 08:31:17 -05:00
Taxi Service 8371aa0b8b renamed Slider to RangeSlider, and added draft of Lua API.rst entry 2023-04-20 13:24:47 +02:00
Taxi Service ae2bdfad5f moved Slider class from filterselection.lua to widgets.lua 2023-04-19 11:28:57 +02:00
Kelly Kinkade f45291780e update structures 2023-04-18 23:19:05 -05:00
Kelly Kinkade f477b82ea9 Merge remote-tracking branch 'upstream/develop' into 5008-beta1 2023-04-18 23:05:06 -05:00
Myk Taylor 649d72e658
add missed NO_LOGIC_SCREEN to the list
adopt_region also kills the top viewscreen on transition
2023-04-18 08:28:00 -07:00
Kelly Kinkade ed87075cb8 cmake minimum version 3.21
forced by this being the lowest version that supports vs 2022
2023-04-18 05:41:08 -05:00
DFHack-Urist via GitHub Actions c30c59c261 Auto-update submodules
library/xml: master
scripts: master
2023-04-18 07:13:59 +00:00
Myk Taylor e9f6695ace
infrastructure for hiding armok tools 2023-04-17 09:39:15 -07:00
Myk Taylor b26d6a90ca
update structures head 2023-04-17 01:06:06 -07:00
Myk Taylor a7aded65e4
match new gems category 2023-04-17 01:04:03 -07:00
Myk Taylor d1d521fbdb
infrastructure for hiding the terminal console on startup 2023-04-16 22:34:29 -07:00
Myk 828a9eb6c9
Merge pull request #3228 from myk002/myk_rawfolder
don't read cur_savegame.save_dir when invalid
2023-04-15 17:08:13 -07:00
DFHack-Urist via GitHub Actions 051baa4e6e Auto-update submodules
library/xml: master
2023-04-15 07:12:55 +00:00
Kelly Kinkade ce6adabbdc sync library/xml to 50.08-beta 2023-04-14 05:52:24 -05:00
Myk Taylor 5ace09fad0
use the World module for the data read 2023-04-14 01:38:38 -07:00
Myk Taylor 52b869d908
don't read cur_savegame.save_dir when invalid 2023-04-14 01:31:06 -07:00
Myk Taylor b9d95c5a0b
bump version to 50.08-rc1 2023-04-13 18:53:11 -07:00
Myk Taylor f13548a47d
continue to ship SDL.dll until DF moves to SDL2 2023-04-13 01:16:22 -07:00
Myk Taylor 48c3a2c987
document which thread each call is coming from 2023-04-13 00:40:10 -07:00
Myk Taylor 6c577fbe26
don't initialize Core from the main thread
that's too early
2023-04-13 00:27:20 -07:00
Myk Taylor 275513319c
remove last reference to SDLReal 2023-04-12 23:14:03 -07:00
Myk Taylor 9f605d6396
call DF's stubs for SDL semaphore functions 2023-04-12 21:48:02 -07:00
Myk Taylor 21784568bd
migrate from SDL interposing to the hooks API 2023-04-12 21:34:16 -07:00
Myk Taylor f7e3973da8
bump to 50.07-r1, scrub changelog 2023-04-12 01:45:42 -07:00
DFHack-Urist via GitHub Actions 766ec620b5 Auto-update submodules
library/xml: master
plugins/stonesense: master
2023-04-11 19:06:51 +00:00
Myk Taylor 63b9599405
update xml head 2023-04-11 10:15:24 -07:00
Myk Taylor 460b1e8eaf
adjust code to new tree root type 2023-04-11 10:14:28 -07:00
Myk Taylor 17373dcffd
constify! 2023-04-10 04:35:34 -07:00
Myk Taylor 836a3edcb9
add some more logging 2023-04-10 04:35:34 -07:00
Kelly Kinkade ce017ee4a8
properly callIs SteamRunningOnSteamDeck 2023-04-10 04:35:34 -07:00
Myk Taylor e4777d2688
add shutdown and cleanup logic 2023-04-10 04:35:34 -07:00
Myk Taylor f0d19c9363
add note about dfhooks 2023-04-10 04:35:34 -07:00
Myk Taylor 6a7446780b
hide terminal console when running on steam deck 2023-04-10 04:35:34 -07:00
Myk Taylor 07c83d3bf3
allow getval to take and pass params 2023-04-10 03:37:10 -07:00
DFHack-Urist via GitHub Actions bd00bb8faf Auto-update submodules
library/xml: master
2023-04-10 07:13:21 +00:00
Myk Taylor 83017e8b8f
give active mods a chance to reattach their hooks 2023-04-07 00:48:04 -07:00
Myk 30bb3d7050
Merge pull request #3168 from myk002/myk_script_paths
read mods from all mod dirs and only use most recent versions
2023-04-05 15:54:24 -07:00
silverflyone 4aa5e9d17b Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop 2023-04-05 12:23:20 +10:00
silverflyone 37d6a05aea
Merge branch 'develop' into develop 2023-04-05 11:49:38 +10:00
silverflyone 2bd24efa4b Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop 2023-04-05 11:49:30 +10:00
silverflyone 0cebad1078 Update Buildings.cpp
Removed extra min/max checks.
2023-04-05 11:49:14 +10:00
DFHack-Urist via GitHub Actions d12938fb23 Auto-update submodules
library/xml: master
scripts: master
2023-04-04 07:13:18 +00:00
Myk Taylor cf847109ce
read mods from all mod dirs and only use most recent versions 2023-04-03 15:59:42 -07:00
Taxi Service 824f7ed038 clean up Items.cpp quality symbols definitions 2023-04-04 00:08:01 +02:00
Taxi Service 7c63ea9394 added BOLD_FRAME and INTERIOR_MEDIUM_FRAME 2023-04-03 20:13:57 +02:00
silverflyone c6fc55f98f
Merge branch 'DFHack:develop' into develop 2023-04-04 03:45:23 +10:00
silverflyone 181f0bdf72 Update Buildings.cpp
Boundary checks added.
2023-04-04 03:27:32 +10:00
silverflyone f8de51aba3 Update Buildings.cpp
Fixes #3159.
Valid map coordinates from (0, 0, 0) to (world->map.x_count - 1, world->map.y_count - 1, world->map.z_count - 1).
Stockpile coords (x1, y1, z) to (x2, y2, z) may lie outside of this region.
Use min of (0, 0) and max of (world->map.x_count - 1, world->map.y_count - 1) when iterating the block.
2023-04-04 03:08:43 +10:00
TaxiService 8d8a4abd13
reverted loss of readability 2023-04-02 02:33:09 +02:00
TaxiService e3bab1eb6b
simplifying character definition even more
removed those pesky superfluous consts and casts...
2023-04-01 23:40:45 +02:00
TaxiService 3a6893de53
attempt to increase code readability
following lethosor and myk's suggestions, each symbol now is its own constant with a descriptive name.
...will it work though?
2023-04-01 16:43:05 +02:00
TaxiService 18f1b5c675
attempt#2 to fix masterwork/exceptional/decorated symbols
this time we're using a couple of `static_cast<char>(...)` thingies
2023-03-31 17:33:23 +02:00
Myk Taylor 38d4eea7ac
bump to 50.07-beta2 2023-03-31 05:02:02 -07:00
Myk Taylor 147b0ba84a
fix and extend Labels/CycleHotkeyLabels 2023-03-28 23:36:49 -07:00
Myk Taylor 63772fd808
ensure rclicks don't bleed through for dialogs 2023-03-27 03:51:45 -07:00
Myk Taylor 0ba4225d85
support showing a different tile on hover for Labels 2023-03-25 15:19:24 -07:00
Myk Taylor 42b18d001b
refresh overlay and helpdb on new world to pick up mod content 2023-03-25 12:56:54 -07:00
Myk Taylor e7f8fbb235
apparaently the macro expansion has an ambiguous else 2023-03-25 12:56:53 -07:00
Myk Taylor 76bacee238
dynamically add mod scripts to the script path 2023-03-25 12:56:48 -07:00
Myk Taylor 2627820bfa
untested -> unavailable 2023-03-25 12:35:01 -07:00
Myk a532012a01
Merge pull request #3090 from myk002/myk_autounsuspend_turndown
turn down autounsuspend gracefully
2023-03-25 12:34:32 -07:00
Myk Taylor a1c2df23c5
fix vscode lint warning 2023-03-24 23:55:54 -07:00
Myk Taylor 2bc92042a5
allow enable to interpret aliases 2023-03-24 23:25:24 -07:00
Myk Taylor fe0590503f
mark tiles with magma or deep water as "not free" 2023-03-24 15:05:17 -07:00
DFHack-Urist via GitHub Actions 0f8478df17 Auto-update submodules
library/xml: master
scripts: master
2023-03-24 07:13:34 +00:00
Kelly Kinkade 95f6e6e5be tailor: fix material overrun issue
properly track materials required for already-queued jobs

fixes #3056
2023-03-23 16:23:06 -05:00
Myk a2ce8a2774
Merge pull request #3075 from myk002/myk_spikey
fix initial extended/retracted position for upright spike traps
2023-03-23 02:23:45 -07:00
Myk Taylor 03e44f1e7f
fix initial extended/retracted position for upright spike traps 2023-03-23 00:25:29 -07:00
DFHack-Urist via GitHub Actions 29c17b407c Auto-update submodules
library/xml: master
2023-03-23 07:13:59 +00:00
DFHack-Urist via GitHub Actions 5ed1e4ece7 Auto-update submodules
library/xml: master
scripts: master
2023-03-22 07:13:59 +00:00
DFHack-Urist via GitHub Actions df93aceb9d Auto-update submodules
library/xml: master
2023-03-21 00:54:38 +00:00
Myk Taylor 779b9bfb6a
bump to 50.07-beta1 2023-03-17 10:08:16 -07:00
Myk Taylor c47f068769
add Lua::Push for sets 2023-03-15 00:28:18 -07:00
DFHack-Urist via GitHub Actions 96c7c952cf Auto-update submodules
library/xml: master
scripts: master
2023-03-14 07:16:34 +00:00
Myk Taylor a5de0fef3e
bump to 50.07-alpha3 2023-03-11 13:56:55 -08:00
Myk Taylor 9b7860125d
ensure elements in deepest dir are added to output list 2023-03-11 02:01:50 -08:00
DFHack-Urist via GitHub Actions 2818f23349 Auto-update submodules
library/xml: master
scripts: master
2023-03-10 07:15:52 +00:00
20k 18160da82e rework to be allocation free, cleanup 2023-03-09 19:36:48 +00:00
DFHack-Urist via GitHub Actions fcfe7e4ef8 Auto-update submodules
library/xml: master
scripts: master
2023-03-08 07:15:19 +00:00
DFHack-Urist via GitHub Actions 26a257eb8c Auto-update submodules
library/xml: master
2023-03-07 07:14:18 +00:00
20k 5a7debfc77 cleanup, linux fix 2023-03-06 17:04:11 +00:00
20k 5cc6293407 fix unused variable on linux 2023-03-06 17:04:10 +00:00
20k 084d28b0ae Reworked heap debugging + tools implementation 2023-03-06 17:04:10 +00:00
Myk Taylor 0562dc5234
constify some MaterialInfo methods 2023-03-05 18:16:49 -08:00
Myk Taylor 028bbca07b
allow vectors to be read from indices other than 1 2023-03-05 16:32:05 -08:00
Myk Taylor d3ef96cc05
allow MaterialInfo structs to be sorted 2023-03-05 16:32:05 -08:00