Commit Graph

4564 Commits (8c4de06999082701a4d50db9e0a88e152ed78b9f)

Author SHA1 Message Date
Ryan Williams c7826c8ddd
Merge branch 'DFHack:develop' into patch-3 2024-01-05 03:30:30 -08:00
Myk Taylor d986c3dcdb
more focus strings for squad equipment page 2024-01-04 18:59:10 -08:00
Myk Taylor d773a2aa18
add in some more focus strings for choose_start_site 2024-01-04 14:15:40 -08:00
DFHack-Urist via GitHub Actions 94de377c0b Auto-update submodules
library/xml: master
scripts: master
2024-01-04 16:57:52 +00:00
Myk Taylor 8f7cb40775
add focus strings for choose_start_site screen 2024-01-04 08:49:39 -08:00
Myk Taylor cd43f89352
differentiate squad equipment customization screen 2024-01-04 08:04:43 -08:00
Ryan Williams f8ba839139
Update MiscUtils.cpp 2024-01-04 06:36:15 -08:00
Ryan Williams 82f9c8823c
Update MiscUtils.cpp 2024-01-04 06:28:30 -08:00
Ryan Williams c4c52a4af5
Update MiscUtils.cpp 2024-01-04 06:01:40 -08:00
Ryan Williams a5fe1fae19
Update MiscUtils.h 2024-01-04 06:01:19 -08:00
Ryan Williams 538150a192
Update LuaApi.cpp 2024-01-04 06:00:56 -08:00
Ryan Williams 302390388b
Update LuaApi.cpp 2024-01-04 05:58:55 -08:00
Myk Taylor e6136c32a5
add ZScreen-based dialogs 2024-01-03 20:06:50 -08:00
Myk Taylor dab2693f56
update structures ref 2024-01-03 18:02:23 -08:00
DFHack-Urist via GitHub Actions 807977fd3d Auto-update submodules
library/xml: master
scripts: master
2024-01-03 22:04:26 +00:00
DFHack-Urist via GitHub Actions 112f3c1a8b Auto-update submodules
library/xml: master
2024-01-02 07:13:22 +00:00
Myk Taylor fa0732d651
fix reverse Some/ focus string 2024-01-01 19:35:02 -08:00
Myk 1aa771fee8
Merge pull request #4119 from myk002/myk_autochop
[autochop] better error output on malformed command
2023-12-31 11:34:20 -08:00
Myk Taylor 02c692150b
gracefully handle nil input in argparse.stringList 2023-12-31 01:17:42 -08:00
Myk Taylor acefd43a13
treat doc source as utf-8 2023-12-30 23:22:26 -08:00
Myk abfbfd5f70
Merge pull request #4106 from dhthwy/really-excise-tinythread
Really excise tinythread
2023-12-30 16:02:17 -08:00
DFHack-Urist via GitHub Actions 42657aed25 Auto-update submodules
library/xml: master
2023-12-28 07:13:06 +00:00
Paxton Schweigert 54769ebdbf Remove tinythread from PluginManager
Remove useless tinythread import in PlugLoad-windows.cpp

Remove seemingly useless tinythread import in LuaTools.cpp

Factor out tinythread in LuaApi.cpp

Removed unused tinythread in LuaWrapper.cpp

Removed unused tinythread include in LuaTypes.cpp

Removed unused tinythread include in ColorText.cpp

Factor out tinythread in Console.h

Factor out tinythread in Console-posix.cpp

Factor out tinythread in Console-windows.cpp

Factor out tinythread in renderer_light

Factor out tinythread in DataDefs.cpp

Remove unused tinythread include in RemoteClient.cpp

Add includes for new mutex and conditional_variable usages in PluginManager

Factor out tinythread from devel/memview, renderermax/renderer_light, and rendermax/renderer_opengl plugins

Remove usages of tinythread in various CMakeLists.txt files, in .ycm_extra_conf.py, and delete tinythread itself

Delete tinythread from LISCENSE.rst

excise tinythread: fix deadlock in pluginmanager

excise tinythread: remove improper header

excise tinythread: fix double unlock. fix plugin typo
2023-12-27 19:23:58 -05:00
DFHack-Urist via GitHub Actions a296f9d5c4 Auto-update submodules
library/xml: master
2023-12-11 07:14:08 +00:00
Myk Taylor 7132f9d64a
add identity traits for new types 2023-12-10 21:30:41 -08:00
Kelly Kinkade 150b9e9399 data identity changes for stl-variant in 50.12 2023-12-10 19:29:48 -06:00
Myk Taylor 75b760a496
add identity for variant 2023-12-10 02:25:53 -08:00
DFHack-Urist via GitHub Actions 7ccc6a15d3 Auto-update submodules
library/xml: master
scripts: master
2023-12-05 07:13:46 +00:00
DFHack-Urist via GitHub Actions 7a2312cf18 Auto-update submodules
library/xml: master
2023-11-29 06:59:58 +00:00
Kelly Kinkade ea6903862b change `unitst::owned_buildings` to `vector<building_civzonest*>`
actually simplifies things lol
2023-11-27 20:38:35 -06:00
Myk e0a7515f69
Merge pull request #4060 from myk002/myk_readable
[Units] add "agitated" and trained levels to getReadableName
2023-11-25 14:08:24 -08:00
Myk Taylor f2afb5c562
add "agitated" and trained levels to getReadableName 2023-11-25 13:46:59 -08:00
DFHack-Urist via GitHub Actions 69b799eab7 Auto-update submodules
library/xml: master
2023-11-25 07:12:23 +00:00
DFHack-Urist via GitHub Actions 3015b3934f Auto-update submodules
library/xml: master
2023-11-24 07:13:08 +00:00
Kelly Kinkade a8f718e387 Merge remote-tracking branch 'upstream/develop' into report_init 2023-11-23 13:51:39 -06:00
Kelly Kinkade 86108da9ab update structures 2023-11-23 12:34:25 -06:00
Myk Taylor 7fedff6111
search and sort for elevate to barony page 2023-11-22 18:04:07 -08:00
Myk Taylor eb14a3fefc
bump to 50.11-r4 2023-11-22 11:22:27 -08:00
Kelly Kinkade adfcbc897e `report_init` -> `announcement_infost`
also changes in field names due to identifying unks and canonicalization
2023-11-21 05:08:40 -06:00
Kelly Kinkade 37322de59b update structures reference 2023-11-21 05:01:09 -06:00
Myk Taylor ba872902c8
Merge remote-tracking branch 'cvuchener/server-accept-fix' into myk_remote_server 2023-11-20 00:07:00 -08:00
Myk Taylor 66120a8c6a
Merge remote-tracking branch 'ab9rf/remoteserver-4040' into myk_remote_server 2023-11-20 00:05:11 -08:00
Myk 0cc7f9f163
Merge pull request #4028 from myk002/myk_build_now
[Buildings] document native completeBuild function
2023-11-19 23:54:50 -08:00
Clément Vuchener 77ce84ca0a Improve Accept error handling in RemoteServer
Also makes sure the socket is blocking to avoid EWOULDBLOCK errors.
2023-11-19 14:46:14 +01:00
Kelly Kinkade 29ca6bbd34 RemoteServer: reset fail counter after success
should close #4040
2023-11-19 06:59:04 -06:00
DFHack-Urist via GitHub Actions 98973f0a36 Auto-update submodules
library/xml: master
scripts: master
2023-11-17 07:24:40 +00:00
Myk Taylor 648476e34d
document native completeBuild function
and remove unneeded params
2023-11-15 16:26:29 -08:00
Myk Taylor f2e5bed633
bump to 50.11-r3 2023-11-14 11:07:21 -08:00
vallode 7b3c03d1fd Fix usage hint for _field method 2023-11-14 11:23:28 +01:00
DFHack-Urist via GitHub Actions d5f8668e28 Auto-update submodules
library/xml: master
2023-11-12 07:13:06 +00:00