Commit Graph

14342 Commits (e308d3204a8396e775df6096578d1c91eb3479af)
 

Author SHA1 Message Date
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
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
Myk Taylor 30e6c44769
addendum for #3480 2023-06-23 10:36:49 -07:00
DFHack-Urist via GitHub Actions 6fa361a326 Auto-update submodules
scripts: master
2023-06-23 17:23:26 +00:00
DFHack-Urist via GitHub Actions 462ec8b877 Auto-update submodules
scripts: master
2023-06-23 07:15:28 +00: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 d77ea845dd
pasture male birds near nestboxes
so they can fetilize the eggs
2023-06-21 11:55:21 -07:00
Myk c0fb6d6465
Merge pull request #3489 from myk002/myk_obsidian
[dig-now] handle obsidian
2023-06-21 02:16:25 -07:00
Myk Taylor 5a90a04a8e
handle obsidian 2023-06-21 02:00:06 -07:00
DFHack-Urist via GitHub Actions afa113645e Auto-update submodules
scripts: master
2023-06-20 14:10:54 +00:00
Myk bdaf24d9bb
Merge pull request #3484 from myk002/myk_orders
[orders] don't display overlay on subscreens
2023-06-20 07:06:43 -07:00
Myk Taylor b571e5b52b
don't diplay orders overlay on subscreens 2023-06-19 16:48:07 -07:00
DFHack-Urist via GitHub Actions 055c2a222e Auto-update submodules
scripts: master
2023-06-19 07:14:18 +00:00
DFHack-Urist via GitHub Actions 538103b90f Auto-update submodules
library/xml: master
2023-06-17 17:19:00 +00:00
Myk 5633d7b6cb
Merge pull request #3480 from myk002/myk_orders
[orders] increase tin ore count requirements in library orders
2023-06-17 09:44:43 -07:00
Myk Taylor 14590d0ae5
increase tin ore count requirements in orders
each order takes multiple boulders of cassiterite. increase limits so
when all orders are active, cassiterite stores are not depleted
2023-06-17 09:36:28 -07:00
DFHack-Urist via GitHub Actions e3841b7496 Auto-update submodules
scripts: master
2023-06-17 16:34:10 +00:00
Myk 18c228e178
Merge pull request #3479 from myk002/myk_blueprints
[blueprint library] update pump_stack and aquifer_tap
2023-06-17 09:27:57 -07:00
Myk 4a26dab8e5
Merge pull request #3478 from myk002/myk_buildingplan_artifact
[buildingplan] don't select artifacts as masterful quality
2023-06-17 09:27:48 -07:00
Myk Taylor 9562897258
move unchanging var out of loop 2023-06-17 05:41:11 -07:00
Myk Taylor 1390fd2e3e
add note about export mandates 2023-06-17 05:40:55 -07:00