Commit Graph

14982 Commits (a500233e0baf78ab28b89150baf92babcaef6509)
 

Author SHA1 Message Date
Eamon Bode e5cbc7fd3c
Merge branch 'develop' into automelt 2023-01-22 04:40:10 -05:00
eamondo2 969f8162a8 Further updates from comments/review. 2023-01-22 04:39:41 -05:00
eamondo2 6585055ed2 fixes, global item counts 2023-01-22 04:13:23 -05:00
Myk Taylor b84bce719d
remove unused always_enabled attribute for overlays
it was made for gui/pathable, but that became a ZScreen
this option made me uncomfortable for overlays. it didn't seem like the
right user experience
2023-01-22 01:07:30 -08:00
Myk Taylor 76822ac7b7
remove orphan fortplan.lua file 2023-01-22 00:59:27 -08:00
Myk Taylor 0f433c61a1
update changelog 2023-01-22 00:47:11 -08:00
Myk Taylor 5a4d61e7fc
don't close the hotspot menu if the logo is clicked
some people click the logo by mistake. this shouldn't close the menu
2023-01-22 00:43:10 -08:00
Myk Taylor bb5a3ac8e9
fix library order for minecarts 2023-01-22 00:06:20 -08:00
DFHack-Urist via GitHub Actions 11befd9726 Auto-update submodules
scripts: master
2023-01-22 07:13:34 +00:00
Myk fdc38ab567
Merge pull request #2690 from dawnmist/orders/update-lye-orders
Attempt to fix lye order limits
2023-01-21 22:23:29 -08:00
Janeene Beeforth 3f9f4fe243 Attempt to fix lye order limits 2023-01-22 17:14:48 +11:00
Myk e89d974b7b
Merge pull request #2689 from dawnmist/orders/update-bag-related-orders
Update orders related to bags for v50.x
2023-01-21 21:53:36 -08:00
Janeene Beeforth aa4cc8ff41 Update orders related to bags for v50.x
Bags now have their own item type, they're no longer mixed in with boxes
2023-01-22 16:42:19 +11:00
Myk 273379c564
Merge pull request #2684 from 20k/getBiomeType
getBiomeType naming, docs, expose to lua
2023-01-21 16:54:42 -08:00
eamondo2 4a4ec7c42b Merge branch 'develop' into automelt 2023-01-21 19:39:10 -05:00
Myk Taylor 9a42e39989
fix sample commandline in dreamfort docs 2023-01-21 16:19:29 -08:00
eamondo2 4c9da4046f Merge branch 'automelt' of github.com:eamondo2/dfhack into automelt 2023-01-21 18:23:03 -05:00
eamondo2 0fbf17f1c8 refactor/fix as per GH suggest 2023-01-21 18:22:15 -05:00
20k 598354d9d4 getbiometype naming, docs 2023-01-21 20:33:40 +00:00
20k 9054efd7c8 Update miscutils to support member pointer to a variable defined in the base when passing in a derived type 2023-01-21 19:15:28 +00:00
20k 3024c4a0df update to remove ambiguity after structures change 2023-01-21 18:45:36 +00:00
20k 1dbf01e5d1 Civzone interop style changes 2023-01-21 18:45:36 +00:00
20k 8c68f54f50 update with squad removal support 2023-01-21 18:45:36 +00:00
pre-commit-ci[bot] 50c3bea84b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-21 07:20:19 +00:00
eamondo2 0a66f41152 fix newline pre-commit.ci complaint 2023-01-21 02:15:35 -05:00
Eamon Bode 8e9ae9eab6
Merge branch 'develop' into automelt 2023-01-21 02:11:05 -05:00
eamondo2 e4e4cae5e6 fix check failures 2023-01-21 02:08:58 -05:00
Myk Taylor bb16009f49
bump version to 50.05-alpha2 2023-01-20 17:13:28 -08:00
Myk Taylor a98c4c0ff0
mark autoclothing as tested 2023-01-20 17:07:29 -08:00
eamondo2 3fc4d056c3 initial automelt 2023-01-20 17:58:48 -05:00
DFHack-Urist via GitHub Actions ac483ed105 Auto-update submodules
scripts: master
2023-01-20 22:48:21 +00:00
Myk Taylor acf2b8b319
use newly narrowd relations vector 2023-01-20 14:30:48 -08:00
Myk 15ba54eea9
Merge pull request #2643 from RosaryMala/Autoclothing
Autoclothing
2023-01-20 14:08:01 -08:00
Myk 064f2834a9
Merge pull request #2669 from ab9rf/5005-alpha2-tailor
tailor: add support for using undyed cloth
2023-01-20 14:06:53 -08:00
Myk 310940e1a2
Merge branch 'develop' into Autoclothing 2023-01-20 14:05:26 -08:00
Rose 8698016b06 Updated docs for Autoclothing 2023-01-20 13:54:18 -08:00
Rose 8e6252fc2b Small fixes to make things more clean. 2023-01-20 13:45:56 -08:00
Kelly Kinkade e8f67c7b62 add support for using undyed cloth
also improved debugging messages
2023-01-20 15:21:45 -06:00
Myk Taylor e138ac1da5
update stonesense 2023-01-20 12:23:02 -08:00
Myk Taylor 25c3bf4a24
adjust to name change 2023-01-20 11:57:13 -08:00
DFHack-Urist via GitHub Actions b7f90d543e Auto-update submodules
library/xml: master
scripts: master
2023-01-20 19:47:11 +00:00
Myk 6aeb3edde5
Merge pull request #2657 from myk002/myk_autodump
update autodump, only commands, add hotkeys
2023-01-20 10:00:01 -08:00
Myk Taylor 226a0ff164
revert autodump hotkeys. we need to discuss how keybindings work more 2023-01-20 09:39:37 -08:00
Myk Taylor a1a4125fd9
properly react to lack of a mouse cursor 2023-01-20 09:31:44 -08:00
Myk Taylor eae2cec22f
use keyboard cursor
and adapt to a "bad" cursor not being equal to -30000 anymore
2023-01-20 09:31:44 -08:00
Myk Taylor 4183bace4d
update autodump, only commands, add hotkeys 2023-01-20 09:31:44 -08:00
Myk d201cf0182
Merge pull request #2662 from 20k/develop
Zone <-> building interactions
2023-01-20 09:30:52 -08:00
Myk 116f9bf8e6
Merge pull request #2641 from myk002/myk_buildingplan
minimal implementation of buildingplan
2023-01-20 09:28:26 -08:00
DFHack-Urist via GitHub Actions 298736d911 Auto-update submodules
scripts: master
2023-01-20 07:14:41 +00:00
Myk 34eb25a530
Merge pull request #2664 from cjhammel/develop
Update Units.cpp
2023-01-19 16:53:38 -08:00