Myk Taylor
|
c587cad471
|
generalize to civ roles as well
|
2023-07-05 17:37:49 -07:00 |
Myk
|
8e7d7fefc0
|
Merge pull request #3527 from myk002/myk_no_extra_keys
filter out spurious STRING keybindings
|
2023-07-05 12:10:51 -07:00 |
|
Myk Taylor
|
43ea9b94c3
|
move clipboard wrappers into DFSDL module (but not in the namespace)
|
2023-07-05 12:08:18 -07:00 |
|
Myk Taylor
|
0bbb72b44f
|
Revert "add new linkage dependency on dfhack"
This reverts commit ae545aa1d6.
|
2023-07-05 11:46:33 -07:00 |
|
Myk Taylor
|
125e4c623b
|
avoid inducing link dependency on dfhack
|
2023-07-05 11:07:51 -07:00 |
|
Myk Taylor
|
e3d3affdbc
|
Revert "add new linkage dependency on dfhack"
This reverts commit 9ddb3813c1.
|
2023-07-05 10:25:07 -07:00 |
DFHack-Urist via GitHub Actions
|
ba974aff98
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-07-04 07:15:34 +00:00 |
|
Myk Taylor
|
cbdb56a1ac
|
port API for unit lookup by noble role from quickfort
|
2023-07-03 13:47:43 -07:00 |
|
Myk Taylor
|
9ddb3813c1
|
add new linkage dependency on dfhack
|
2023-07-03 12:34:49 -07:00 |
|
Myk Taylor
|
e7f5b1f949
|
move command_result enum from Export to Core
|
2023-07-03 11:53:46 -07:00 |
|
Myk Taylor
|
f111b69f2f
|
Merge branch 'develop' into myk_cpp20
|
2023-07-03 11:49:54 -07:00 |
|
Myk Taylor
|
5a36a0fcbd
|
ensure we can still inject strings with simulateInput
|
2023-07-03 11:44:33 -07:00 |
|
Myk Taylor
|
ae545aa1d6
|
add new linkage dependency on dfhack
|
2023-07-03 11:18:14 -07:00 |
|
Myk Taylor
|
9ca96567a5
|
move conversion logic to MiscUtils
but keep minimal wrappers in SDL module so we don't leak memory
|
2023-07-03 11:05:58 -07:00 |
|
Myk Taylor
|
fdf2430fc4
|
filter out spurious STRING keybindings
that don't match actual SDL string input
|
2023-07-03 09:09:52 -07:00 |
|
Myk Taylor
|
07e8edcdca
|
ensure changing text fires the on_change event
|
2023-07-02 19:27:07 -07:00 |
|
Myk Taylor
|
c660a12502
|
differentiate between choosing merchant screen and default trade screen
|
2023-07-02 19:09:15 -07:00 |
|
Myk Taylor
|
d39440d33b
|
migrate markForTrade logic from logistics to core
|
2023-07-02 19:05:50 -07:00 |
|
Myk Taylor
|
acd03486a9
|
add some more detail to the focus strings for buildings
|
2023-07-02 19:05:50 -07:00 |
|
Myk Taylor
|
18a9a7d1fa
|
allow invalid options to default to the first option
and make the range slider move the other slider if it would become
invalid
|
2023-07-02 19:05:47 -07:00 |
|
Myk Taylor
|
175c249d29
|
support copy/paste from system clipboard
|
2023-07-02 18:04:06 -07:00 |
|
DFHack-Urist via GitHub Actions
|
b5fd877b84
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-07-01 07:13:51 +00:00 |
|
Myk Taylor
|
09027543df
|
update to 50.09-r1
|
2023-06-26 16:31:18 -07:00 |
|
Myk Taylor
|
e308d3204a
|
Merge branch 'develop' into sdl2
|
2023-06-26 16:04:50 -07:00 |
|
Myk Taylor
|
164a889479
|
update xml ref
|
2023-06-26 16:02:05 -07:00 |
|
Myk
|
d9d0482386
|
Merge pull request #3501 from myk002/myk_diplomacy
[Gui] differentiate trade request screen from other diplomacy screens
|
2023-06-26 11:46:25 -07:00 |
|
Myk Taylor
|
b5f4cef187
|
differentiate trade request screen from other diplomacy screens
|
2023-06-26 02:29:36 -07:00 |
|
DFHack-Urist via GitHub Actions
|
9b74492919
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-06-26 07:15:49 +00:00 |
|
Myk Taylor
|
d54c13121b
|
use new icons from RafaelKB
|
2023-06-25 18:56:37 -07:00 |
|
Myk Taylor
|
8235680ff0
|
add unsuspend map textures
|
2023-06-25 18:40:04 -07:00 |
|
Myk Taylor
|
78448f438d
|
don't leak warning suppression out of protobuf
|
2023-06-25 17:53:16 -07:00 |
|
Myk Taylor
|
8f1efcd8a3
|
remove need to ignore warnings for dfhack-dependent targets
|
2023-06-25 17:44:06 -07:00 |
Kelly Kinkade
|
f2dc910b28
|
update for 50.09sdl2-3
|
2023-06-24 20:10:27 -05:00 |
|
Myk Taylor
|
20e425dc4f
|
update to newest df sdl beta
|
2023-06-23 14:50:06 -07:00 |
|
Myk
|
b958727655
|
Update Textures.cpp
|
2023-06-23 14:36:26 -07:00 |
|
Myk
|
e101a6d9dc
|
Update Textures.h
|
2023-06-23 14:36:26 -07:00 |
|
Myk Taylor
|
f7bef53b42
|
prefer symbols to descriptions for hotkey names
|
2023-06-23 14:36:18 -07:00 |
|
Myk Taylor
|
840a2b3525
|
ensure DFHack screens get all string input
|
2023-06-23 14:36:18 -07:00 |
Taxi Service
|
3e2940ef8f
|
attempt to set optional tilesize arguments for load_texture()
|
2023-06-23 14:35:45 -07:00 |
|
Myk Taylor
|
a48344fd24
|
get keybindings working again
|
2023-06-23 14:31:14 -07:00 |
|
Myk Taylor
|
52151b0e98
|
remove SDL functions that don't exist anymore
|
2023-06-23 14:31:14 -07:00 |
|
Myk Taylor
|
4e48ce64f1
|
get things mostly ported to SDL2
|
2023-06-23 14:31:12 -07:00 |
|
Myk Taylor
|
eff1755675
|
bump to 50.08-r4
|
2023-06-23 10:59:21 -07:00 |
|
DFHack-Urist via GitHub Actions
|
fab840d90e
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-06-21 23:22:38 +00:00 |
|
Myk Taylor
|
b571e5b52b
|
don't diplay orders overlay on subscreens
|
2023-06-19 16:48:07 -07:00 |
|
Myk Taylor
|
8a079e1ae7
|
get compiling on windows
|
2023-06-17 22:14:11 -07:00 |
|
Myk Taylor
|
2efef75b4e
|
re-constify
|
2023-06-17 10:46:56 -07:00 |
|
Myk Taylor
|
9dba18124e
|
attach compile options to dfhack that allow protobuf headers to be included
|
2023-06-17 10:44:38 -07:00 |
|
DFHack-Urist via GitHub Actions
|
538103b90f
|
Auto-update submodules
library/xml: master
|
2023-06-17 17:19:00 +00:00 |
|
DFHack-Urist via GitHub Actions
|
a487e98913
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-06-09 07:13:44 +00:00 |
|
Myk Taylor
|
25530d6e7b
|
guide update - first draft
|
2023-06-08 12:40:33 -07:00 |
|
DFHack-Urist via GitHub Actions
|
873000df80
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-06-08 07:13:15 +00:00 |
|
Myk Taylor
|
394db656e6
|
remove obsolete BUILD_DEVEL option and logic
|
2023-06-06 17:49:15 -07:00 |
|
Myk Taylor
|
b4a804ca0c
|
bump to 50.08-r3
|
2023-06-05 17:42:35 -07:00 |
|
Myk Taylor
|
4a2b97105c
|
only initialize steam if launched from steam
|
2023-06-05 14:18:55 -07:00 |
|
Myk Taylor
|
ecf82471cf
|
update for 50.08-r2
|
2023-06-01 11:20:08 -07:00 |
|
Myk Taylor
|
5c914280c3
|
change dynamic_cast -> virtual_cast
|
2023-06-01 10:53:08 -07:00 |
|
Myk Taylor
|
974a6155c0
|
reinstated Buildings.setOwner
|
2023-05-31 18:48:08 -07:00 |
|
DFHack-Urist via GitHub Actions
|
7dad5be7dc
|
Auto-update submodules
library/xml: master
|
2023-05-29 07:13:57 +00:00 |
|
Myk
|
0c5339982a
|
Merge pull request #3424 from myk002/myk_ensure_keys
add ensure_keys utility function
|
2023-05-28 20:36:48 -07:00 |
|
Myk Taylor
|
8b3eef699f
|
adjust findCivzonesAt to v50 semantics
|
2023-05-27 05:37:31 -07:00 |
|
Myk Taylor
|
0918fbb004
|
add ensure_keys utility function
|
2023-05-27 03:16:51 -07:00 |
|
DFHack-Urist via GitHub Actions
|
27ee0ae396
|
Auto-update submodules
library/xml: master
|
2023-05-27 07:12:17 +00:00 |
|
Myk
|
2efeead96e
|
Merge pull request #3414 from myk002/myk_scroll_to_focus
scroll mouse wheel to focus window under cursor
|
2023-05-25 17:18:52 -07:00 |
|
Myk
|
906b1570b9
|
Merge pull request #3417 from myk002/myk_draggable_frame
allow dragging by frame edge for non-resizable windows
|
2023-05-25 17:18:40 -07:00 |
|
Myk Taylor
|
87775317a5
|
don't throw if json is unreadable
just act like the file didn't exist (unless strict is set)
|
2023-05-24 12:41:02 -07:00 |
|
DFHack-Urist via GitHub Actions
|
44340dfb75
|
Auto-update submodules
library/xml: master
scripts: master
plugins/stonesense: master
|
2023-05-24 07:12:57 +00:00 |
|
DFHack-Urist via GitHub Actions
|
4ba2c807b2
|
Auto-update submodules
library/xml: master
scripts: master
|
2023-05-23 22:26:06 +00:00 |
|
Myk Taylor
|
f6d9af5725
|
also set focus on shift-scrolling
|
2023-05-23 15:20:09 -07:00 |
|
Myk Taylor
|
6f49a0eb3d
|
allow dragging by frame edge for non-resizable windows
|
2023-05-23 15:17:01 -07:00 |
|
Myk Taylor
|
f3ce805960
|
scroll mouse wheel to focus window under cursor
|
2023-05-23 12:26:44 -07:00 |
|
Myk Taylor
|
848556158b
|
update HEADs
|
2023-05-21 09:45:37 -07:00 |
|
Myk
|
731db4b584
|
Merge pull request #3403 from myk002/myk_relaunch
launch DFHack through steam if DF is run from steam
|
2023-05-20 14:32:14 -07:00 |
|
Myk
|
a969ff2aea
|
Merge branch 'develop' into develop
|
2023-05-20 04:55:50 -07:00 |
|
Myk Taylor
|
9dffba6843
|
amend #2914 so lists don't jump around on resize
|
2023-05-20 04:38:03 -07:00 |
|
Myk Taylor
|
8c01f3efe0
|
don't relaunch launchdf if it's already running
|
2023-05-20 02:59:41 -07:00 |
|
Myk Taylor
|
a5a6b70a51
|
launch DFHack through steam if DF is run from steam
|
2023-05-20 02:59:39 -07:00 |
|
Myk
|
57d2edc84e
|
Update widgets.lua
|
2023-05-19 12:12:52 -07:00 |
|
Myk
|
bd7ac0453b
|
Merge branch 'develop' into list-setselected-fix
|
2023-05-19 12:05:30 -07:00 |
|
Taxi Service
|
c52b1cc950
|
reverted to just renaming FRAMES in gui.lua
|
2023-05-18 12:46:21 +02:00 |
|
Taxi Service
|
90fe6e7ae3
|
swapped any instance of 'border' being after 'xyz', everywhere
|
2023-05-18 11:30:21 +02:00 |
|
Taxi Service
|
eb742a603d
|
renamed XYZ_FRAME to FRAME_XYZ
|
2023-05-18 11:22:58 +02:00 |
|
Myk
|
c38e5e65e6
|
Merge pull request #3387 from myk002/myk_classic
Dynamically look up texture values instead of assuming they're constant
|
2023-05-17 11:52:41 -07:00 |
|
Myk
|
7c2216e196
|
Merge pull request #3373 from myk002/myk_gamey
[autolabor] adjust usage to game structure reunification
|
2023-05-17 11:38:29 -07:00 |
|
Myk
|
5268de8dd8
|
Merge branch 'develop' into myk_classic
|
2023-05-17 11:27:33 -07:00 |
|
Myk
|
29ece9ce3f
|
Merge pull request #3381 from myk002/myk_substring_filter
make full text search configurable for list filters
|
2023-05-17 11:26:45 -07:00 |
|
Myk
|
20c6062b51
|
Merge pull request #3388 from myk002/myk_tab_defaults
give widgets.TabBar default hotkeys
|
2023-05-17 11:23:17 -07:00 |
|
Myk Taylor
|
aa6baae834
|
update structures ref
|
2023-05-17 11:14:00 -07:00 |
|
Myk
|
f265767d7a
|
Merge branch 'develop' into myk_remote_server
|
2023-05-17 10:21:02 -07:00 |
|
Myk Taylor
|
899422aaf8
|
give widgets.TabBar default hotkeys
|
2023-05-16 17:26:16 -07:00 |
|
Myk Taylor
|
11361975f9
|
look up texpos values instead of assuming they're constant
|
2023-05-16 17:14:36 -07:00 |
|
Myk Taylor
|
217be6b58d
|
make full text search configurable for list filters
|
2023-05-16 12:36:58 -07:00 |
|
Myk Taylor
|
f05fe33307
|
fix crash on malformed json (again)
|
2023-05-16 11:26:47 -07:00 |
|
Myk Taylor
|
a62993b90b
|
add DFHACK_DISABLE env var
|
2023-05-15 18:15:46 -07:00 |
|
Myk Taylor
|
1a703c344f
|
support disabling DFHack with --disable-dfhack
|
2023-05-15 17:41:28 -07:00 |
|
Myk Taylor
|
8f5c454b39
|
add focus strings for new_region
|
2023-05-03 15:52:01 -07:00 |
|
Myk Taylor
|
ad5a0d41f5
|
only show the terminal if requested
|
2023-05-03 14:34:48 -07:00 |
|
Myk Taylor
|
bebf3584ba
|
maybe fix terminal in foreground issue
|
2023-05-03 14:15:36 -07:00 |
|
Myk Taylor
|
d21a6c6432
|
update symbols for 50.08 itch and classic
|
2023-05-02 14:34:45 -07:00 |
|
Taxi Service
|
ef0c8950bd
|
renamed val_gap to option_gap, updated docs/changelog
|
2023-05-02 16:46:46 +02:00 |
|
TaxiService
|
f181b50a30
|
Merge branch 'develop' into cyclehotkey2
|
2023-05-02 08:22:10 +02:00 |
|
Myk Taylor
|
3f51f24f91
|
fix errors when dragging a scrollbar and the mouse leaves the window
|
2023-04-30 17:12:43 -07:00 |
|
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 |