Commit Graph

14566 Commits (a299f0b5fb1f36047c60352b1a775010edf15d9c)
 

Author SHA1 Message Date
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
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
Myk edbb6e2fa8
Merge pull request #3499 from myk002/myk_doc_fix
[blueprint library guide] fix internal link to screenhot header
2023-06-25 19:20:51 -07: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 5e13eb89d8
fix internal link to screenhot header 2023-06-25 18:29:21 -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 Taylor 2a361ae796
re-enable faststart now that the DF race condition has been fixed 2023-06-23 14:36:27 -07:00
Myk 2101918158
Update pathable.cpp 2023-06-23 14:36:27 -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
Myk Taylor 0790ace9fd
temporarily disable faststart
until DF no longer has a race condition
2023-06-23 14:36:17 -07:00
Myk Taylor 258b647ef6
extend the title version widget to show longer version strings 2023-06-23 14:36:17 -07:00
Myk Taylor 95b9cb0ab3
match DF's version string in ours 2023-06-23 14:36:16 -07:00
Taxi Service 3e2940ef8f
attempt to set optional tilesize arguments for load_texture() 2023-06-23 14:35:45 -07:00
Myk Taylor a51032b8ee
use standard ROOT path structure 2023-06-23 14:34:58 -07:00
Myk Taylor 05ae92f085
move SDL2 to depends in the src dir 2023-06-23 14:34:51 -07:00
Myk Taylor f6228240d2
move zlib download back to src dir 2023-06-23 14:34:51 -07:00
Myk Taylor 90a2806251
fix paths 2023-06-23 14:34:37 -07:00
Myk Taylor 61eeea20e8
ensure offline builds still work; clean up 2023-06-23 14:33:54 -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