Commit Graph

15478 Commits (e86809dc4befafe10cfa64720c01312e9f381eea)
 

Author SHA1 Message Date
Myk e86809dc4b
Merge pull request #4001 from myk002/myk_hawkowl
fix merge conflicts for PR #2555
2023-11-09 15:37:15 -08:00
Myk Taylor 255a1fc74f
Merge branch 'develop' into myk_hawkowl 2023-11-09 15:29:58 -08:00
Myk aba5ddb5b3
Merge pull request #3984 from ToxicBananaParty/placesort
Add search overlay to Locations page
2023-11-09 12:24:25 -08:00
Ryan Dwyer 8533f06efb Minor syntax fixes 2023-11-09 12:11:48 -08:00
Ryan Dwyer e6a6185627 Fix string concatenation syntax 2023-11-09 01:37:13 -08:00
Ryan Dwyer 5b8de86142 Implement suggested changes 2023-11-09 01:35:27 -08:00
Ryan Dwyer 78b7926d50 Make get_religion_string ifs more readable, add dwarfified profession string to get_profession_string 2023-11-09 01:34:47 -08:00
Ryan Dwyer 7516e6f268 Replace string comparison with df.is_instance 2023-11-08 17:44:40 -08:00
Ryan Dwyer 674bf94344 More code reuse with sort/locationselector 2023-11-08 17:36:31 -08:00
pre-commit-ci[bot] a21695ccc2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-08 20:43:26 +00:00
Ryan Dwyer fc7b8a2266 Merge branch 'placesort' of github.com:ToxicBananaParty/dfhack into placesort 2023-11-08 12:42:03 -08:00
Ryan Dwyer 217258b013 Better code reuse with locationselector.get_religion_string 2023-11-08 12:41:28 -08:00
Ryan Dwyer 6d5fad630d
Merge branch 'develop' into placesort 2023-11-08 12:35:39 -08:00
Myk 8a336b1a5a
Merge pull request #3983 from ToxicBananaParty/patch-1
Update Authors.rst
2023-11-08 08:14:29 -08:00
Ryan Dwyer f3e96d206c Add search overlay to Locations page 2023-11-08 03:25:47 -08:00
Ryan Dwyer dc0c42e995
Update Authors.rst 2023-11-08 02:09:03 -08:00
Myk c713c4d979
Merge pull request #3977 from ToxicBananaParty/placesort
Add search to Zones page
2023-11-08 00:59:30 -08:00
Ryan Dwyer 924c780210 Replace slashes with spaces for multi-named zones 2023-11-08 00:30:58 -08:00
Ryan Dwyer e58553fd0c Replace get_location_type_from_language_name with static language_name_type mapping 2023-11-07 21:29:27 -08:00
Ryan Dwyer 14d441344f Rename 'get_typestring_from_language_name' to 'get_location_type_from_language_name' 2023-11-07 12:55:55 -08:00
Ryan Dwyer fc2819ec1a Add get_typestring_from_language_name 2023-11-07 12:52:04 -08:00
Ryan Dwyer 4798dc6560 Fix nested if order of operations 2023-11-07 02:30:06 -08:00
pre-commit-ci[bot] 8b625e30db [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-07 10:26:04 +00:00
Ryan Dwyer 2162341e7f Implement myk002's proposed changes 2023-11-07 02:24:30 -08:00
Ryan Dwyer 5df373c3c5
Merge branch 'develop' into placesort 2023-11-07 00:00:33 -08:00
pre-commit-ci[bot] b71e283b3e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-07 07:54:35 +00:00
Myk ce55f8f992
Merge pull request #3975 from robob27/remove-old-trackstop
Remove old trackstop
2023-11-06 23:51:36 -08:00
Myk 3c5bc26513
Merge branch 'develop' into remove-old-trackstop 2023-11-06 23:41:00 -08:00
DFHack-Urist via GitHub Actions 8a2416629c Auto-update submodules
scripts: master
2023-11-07 07:40:44 +00:00
Ryan Dwyer 9953f81248 Add search to Zones page 2023-11-06 23:28:08 -08:00
Myk 221f5eb610
Merge pull request #3900 from ab9rf/completebuild
implement `Buildings::completebuild` function export from DF
2023-11-06 22:51:20 -08:00
Myk 5dc080849c
Merge branch 'develop' into completebuild 2023-11-06 22:43:39 -08:00
Myk 20a7d8e59d
move changelog items to current release 2023-11-06 22:42:42 -08:00
Myk aa59cab932
Merge pull request #3974 from robob27/trackstop-focus
Add trap type to focus string
2023-11-06 22:38:52 -08:00
Kelly Kinkade c9996d6e45 stylistic change
recommended to me by a colleague
2023-11-06 22:28:22 -06:00
Kelly Kinkade f1ed469ca3 implement `Buildings::completebuild` function export from DF
to be used by `build-now`
2023-11-06 22:28:21 -06:00
Robob27 248a5922ba Remove old trackstop 2023-11-06 23:27:35 -05:00
Robob27 c3b3dda80b Feedback 2023-11-06 23:13:50 -05:00
Robob27 89428bb343 Add trap type to focus string 2023-11-06 22:48:21 -05:00
Myk Taylor 4fb7694e6e
reset subset filters when the context is exited 2023-11-06 17:58:36 -08:00
Myk 6fa65af4e3
Merge pull request #3498 from orrche/remoteserver_accept_fix
Fix so failed accept doesn't terminate the server
2023-11-06 17:40:00 -08:00
Myk b0b60265b4
Merge pull request #3825 from lethosor/css-allow-no-perturb
check-structures-sanity: Allow running without MALLOC_PERTURB_
2023-11-06 17:32:34 -08:00
Myk fa78bde481
Update library/RemoteServer.cpp
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2023-11-06 17:31:46 -08:00
Myk c6db01a3a2
Update library/RemoteServer.cpp 2023-11-06 17:31:41 -08:00
Myk d65ef21251
Merge branch 'develop' into remoteserver_accept_fix 2023-11-06 17:29:54 -08:00
Myk Taylor b22e57fe1f
allow 3d box select to start or end out of bounds 2023-11-06 16:20:22 -08:00
DFHack-Urist via GitHub Actions 2760fd7531 Auto-update submodules
library/xml: master
scripts: master
2023-11-06 22:50:58 +00:00
Myk 43c9837440
Merge pull request #3973 from DFHack/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-11-06 13:16:56 -08:00
pre-commit-ci[bot] 649dfcca3f
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0)
- [github.com/python-jsonschema/check-jsonschema: 0.27.0 → 0.27.1](https://github.com/python-jsonschema/check-jsonschema/compare/0.27.0...0.27.1)
2023-11-06 19:28:06 +00:00
Myk 5f4ae06b98
Merge pull request #3971 from myk002/myk_burrowsaaaa
[sort] military and burrow membership filters for burrow assignment
2023-11-06 09:07:36 -08:00