Commit Graph

15549 Commits (121106dd04ac182c3a9589fe8a3fb8eee2f64fb2)
 

Author SHA1 Message Date
Myk Taylor c2e647b79b
fix item prices and algorithm
adjust prices according to race WAR affinity
2023-07-06 03:24:15 -07:00
Myk Taylor 9849885df6
Revert "generalize dfhack.items.isRequestedTradeGood"
This reverts commit aa6d28bab6.
2023-07-06 03:23:17 -07:00
Myk Taylor aa6d28bab6
generalize dfhack.items.isRequestedTradeGood 2023-07-06 03:21:36 -07:00
DFHack-Urist via GitHub Actions c0190397a9 Auto-update submodules
scripts: master
2023-07-06 07:16:05 +00:00
Myk 79dbcf0461
Merge pull request #3524 from myk002/myk_copypaste
support copy/paste from system clipboard
2023-07-05 23:09:08 -07:00
Myk 785405b281
Update DFSDL.cpp 2023-07-05 22:34:25 -07:00
Myk 50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
get compiling with c++-20
2023-07-05 22:28:59 -07:00
Myk c25b6e642e
Merge pull request #3533 from myk002/myk_noble
port API for unit lookup by noble role from quickfort
2023-07-05 19:34:29 -07:00
Myk Taylor 0b9f84a5da
don't print error if a building is not selected 2023-07-05 19:06:57 -07:00
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 aa3fad19d2
Merge pull request #3531 from DFHack/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-07-03 23:28:40 -07:00
pre-commit-ci[bot] 9e3094c0fc
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/python-jsonschema/check-jsonschema: 0.23.1 → 0.23.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.23.1...0.23.2)
2023-07-04 02:43:29 +00:00
IvoryTower33 4e7f4b638c
Update autonick.txt 350+ dwarf names single and composite 2023-07-03 23:12:42 +02:00
IvoryTower33 7c63dcd6bd
Update autonick.txt with fantasy Dwarf names, 210 single&180 composite 2023-07-03 23:02:39 +02: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 c7b24e4cb6
Merge pull request #3504 from myk002/myk_widget
widget and focus string enhancements
2023-07-03 11:47:49 -07:00
Myk Taylor 5a36a0fcbd
ensure we can still inject strings with simulateInput 2023-07-03 11:44:33 -07:00
Myk Taylor 7e92123952
update changelog 2023-07-03 11:27:13 -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
Kelly Kinkade 354f56cc33 include vs17.6 in acceptable version range 2023-06-30 09:37:50 -05:00
Myk Taylor 09027543df
update to 50.09-r1 2023-06-26 16:31:18 -07:00
Myk c8c8f2e58c
Merge pull request #3500 from DFHack/sdl2
Sdl2 compatibility
2023-06-26 16:14:33 -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
Kent Gustavsson 09148698c8 add counter for socket accept fails
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Kent Gustavsson e68aa50f43 update changelog
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Kent Gustavsson ccae8bc77b add error output on failing to accept connection
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Kent Gustavsson dfd453ae05 fix so failed accept doesn't terminate the server
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02: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 89d11544a3
Merge pull request #3483 from myk002/myk_unsuspend
add unsuspend map textures
2023-06-25 19:21:30 -07:00