Commit Graph

13048 Commits (840f728c665ee9de55e6881cd71942ddcda10e69)
 

Author SHA1 Message Date
Rose 840f728c66 Merge remote-tracking branch 'DFHack/develop' into Autoclothing
# Conflicts:
#	docs/changelog.txt
2023-02-02 13:14:50 -08:00
Rose 7d304dbaf8 Update autoclothing docs. 2023-02-02 13:08:23 -08:00
Rose ea22a23ab7 Clean up autoclothing for release. 2023-02-02 13:06:14 -08:00
Myk Taylor 7d05a68c60
clean up changelog, update refs 2023-02-02 12:53:20 -08:00
DFHack-Urist via GitHub Actions 75bb67cfc4 Auto-update submodules
scripts: master
2023-02-02 07:14:31 +00:00
Myk Taylor 5a1c3c7aa8
remove unused vars copypastad from seedwatch 2023-02-01 22:30:56 -08:00
DFHack-Urist via GitHub Actions ca2078c62d Auto-update submodules
scripts: master
2023-02-02 05:00:25 +00:00
DFHack-Urist via GitHub Actions 648f264906 Auto-update submodules
scripts: master
2023-02-02 01:55:29 +00:00
Myk a3f32e66ad
Merge pull request #2775 from myk002/myk_non_defocusable
add defocusable attribute to ZScreen
2023-02-01 17:53:21 -08:00
Myk 79d5ade02d
Merge pull request #2776 from myk002/myk_pause_forced
display PAUSE FORCED instead of a pause icon
2023-02-01 17:53:11 -08:00
Myk 1debea59a8
Merge branch 'develop' into myk_non_defocusable 2023-02-01 17:51:04 -08:00
Myk 7fbd95896d
Merge branch 'develop' into myk_pause_forced 2023-02-01 17:50:45 -08:00
Myk 21f93173c3
Merge pull request #2778 from myk002/myk_halfsies
support offset text in graphics mode for pens
2023-02-01 17:50:24 -08:00
Myk c312a88bea
Merge pull request #2773 from myk002/myk_nestboxes
[nestboxes] update and simplify; persist state
2023-02-01 17:50:07 -08:00
Myk 7468170751
Merge pull request #2771 from myk002/myk_seedwatch
update seedwatch
2023-02-01 17:49:57 -08:00
Myk 6513b591bd
Merge pull request #2768 from myk002/myk_textures
add textures used by new gui/control-panel
2023-02-01 17:49:48 -08:00
Myk d594bc2c96
Merge pull request #2767 from myk002/myk_unbreak_tile
allow tile in Label tokens to be either pen or id
2023-02-01 17:49:39 -08:00
Myk Taylor 58be8cfd69
support offset text in graphics mode for pens 2023-02-01 17:39:32 -08:00
Myk Taylor 55d07a8cae
actually use the tile 2023-02-01 14:51:46 -08:00
Myk Taylor 6ae771ecb4
display PAUSE FORCED instead of a pause icon
if the window is forcing the game to pause. the icon looked too
clickable
2023-02-01 14:01:29 -08:00
Myk Taylor 88860f21ec
add defocusable attribute to ZScreen 2023-02-01 08:46:32 -08:00
Myk Taylor fd4b0d7233
update and simplify nestboxes; persist state 2023-02-01 04:58:23 -08:00
Myk Taylor b02405ea97
update changelog 2023-02-01 04:30:45 -08:00
Myk Taylor aae5d5f411
reduce diff in Kitchen.h 2023-02-01 04:28:07 -08:00
Myk Taylor febb2bf030
use actual item and unit positions 2023-02-01 04:24:42 -08:00
Myk Taylor be40d55e64
update seedwatch 2023-02-01 04:03:28 -08:00
Myk Taylor 0ff7ad0cc4
update tailor docs 2023-01-31 23:55:54 -08:00
Myk Taylor 5127f06571
expose new tiles to Lua 2023-01-31 23:55:30 -08:00
Myk Taylor e442e23589
allow tile in Label tokens to be either pen or id 2023-01-31 23:54:27 -08:00
Myk Taylor aa22917aeb
add new control panel textures 2023-01-31 23:52:30 -08:00
DFHack-Urist via GitHub Actions d6a4b1d37a Auto-update submodules
scripts: master
2023-02-01 07:15:02 +00:00
DFHack-Urist via GitHub Actions d7bd3e5d55 Auto-update submodules
scripts: master
2023-01-31 07:14:26 +00:00
Myk 04754c2900
Merge pull request #2763 from myk002/myk_quickstart
Update hotkeys and quickstart guide for gui/control-panel
2023-01-30 14:25:19 -08:00
Myk Taylor 69860ce419
update changelog 2023-01-30 14:23:47 -08:00
Myk Taylor 3805925c02
update quickstart guide with control panel info 2023-01-30 14:23:47 -08:00
Myk Taylor 0c92317cce
give gui/control-panel a global hotkey 2023-01-30 14:23:47 -08:00
DFHack-Urist via GitHub Actions 2cbf9123f2 Auto-update submodules
scripts: master
2023-01-30 22:23:13 +00:00
Myk Taylor ab4c766817
Revert "allow tile list icons to be rendered properly"
This reverts commit 508777897b.
the fix was incorrect. the icon should be set to the pen when it is
not a string, the icon_pen is only for when it is a string
2023-01-30 08:48:45 -08:00
lethosor 282da701bb
changelog: add #2689, fix a few typos, add a link 2023-01-29 23:58:01 -05:00
Myk 18da23af09
Merge pull request #2755 from ab9rf/autohauler
remove autohauler
2023-01-29 20:04:14 -08:00
Kelly Kinkade 93bfbde8d7 doc updates for removal of autohauler 2023-01-29 21:54:02 -06:00
Myk a0b3656c45
Merge pull request #2737 from johncosker/merge-autoslab
Implement autoslab engraving feature
2023-01-29 19:46:41 -08:00
Kelly Kinkade 40e69bfa3f remove autohauler
autohauler just doesn't make sense in v50
2023-01-29 20:38:39 -06:00
John Cosker f1c173863c Remove trailing whitespace 2023-01-29 21:36:49 -05:00
John Cosker 3f9f785589 Update doc and remove unused enum 2023-01-29 21:34:47 -05:00
DFHack-Urist via GitHub Actions 4c17d79198 Auto-update submodules
library/xml: master
2023-01-30 02:28:17 +00:00
DFHack-Urist via GitHub Actions 57c5340930 Auto-update submodules
scripts: master
2023-01-30 02:14:05 +00:00
Myk Taylor 8774d3191f
sync tags from spreadsheet 2023-01-29 17:59:16 -08:00
Rose c9ddb4d943 There was one more place for autoclothing to crash. 2023-01-29 17:51:10 -08:00
Rose c79b95ec33 Don't crash autoclothing if a dwarf has a broken inventory item. 2023-01-29 17:48:23 -08:00