Commit Graph

12859 Commits (8f7788ec2091195eaa37c45c3f1a4a65926301fa)
 

Author SHA1 Message Date
eamondo2 8f7788ec20 Merge branch 'develop' into automelt 2023-01-22 20:32:43 -05:00
Myk 2e9a826d21
Merge pull request #2612 from kelvie/ccompile-script
Add cross-compile script
2023-01-22 17:16:33 -08:00
Myk f805f5b67e
Merge branch 'develop' into ccompile-script 2023-01-22 17:16:19 -08:00
Myk d82a795ef4
Merge pull request #2681 from 20k/develop
More civzone <-> building work, add removing zones with associated squads support
2023-01-22 17:14:24 -08:00
Myk 62709ef8d1
Merge pull request #2692 from myk002/myk_click_logo
Don't close the popup menu when clicking on the logo
2023-01-22 17:12:49 -08:00
Myk f2c2fffac5
Merge branch 'develop' into myk_click_logo 2023-01-22 17:10:27 -08:00
Myk ab10b84de4
Merge pull request #2693 from myk002/myk_revert_always_enabled
remove unused always_enabled attribute for overlays
2023-01-22 17:10:04 -08:00
Myk 7e51d3e5aa
Merge pull request #2694 from myk002/myk_orders_overlay
first attempt at a manager orders overlay
2023-01-22 17:09:42 -08:00
Myk Taylor 0c5514ff2d
update changelog 2023-01-22 15:39:12 -08:00
Myk Taylor b4c49f36e1
document orders overlay 2023-01-22 15:39:05 -08:00
20k 4559168005 update for multiple ownership 2023-01-22 22:59:25 +00:00
eamondo2 d6c4f15e33 Merge branch 'develop' into automelt 2023-01-22 17:26:55 -05:00
Kelvie Wong fb1ce3fed7 Add changelog. 2023-01-22 11:45:13 -08:00
Kelvie Wong ce12e2d906 Also build docs.
The in-game docs aren't built otherwise, so you won't get help for the
various commands if this isn't set.
2023-01-22 11:45:13 -08:00
Kelvie Wong 839636a563 Change $HOME to ~
As $HOME shows /root under sudo
2023-01-22 11:45:13 -08:00
Kelvie Wong 5a20f775bf Set UIDs properly on run; fix sudo use
This depends on a new entrypoint put inside the docker image, that will
read BUILDER_UID and fix up the users and files.

This also removes "sudo" and allows the entire script to be run with
sudo without messing with the build file permissions.
2023-01-22 11:45:13 -08:00
Kelvie Wong aaaf2d9f22 Add cross-compile script
That will simply generate the win64 artifacts for those of us that run
DF under Proton on Steam for Linux.
2023-01-22 11:45:13 -08:00
Myk Taylor 740abba621
update comments in quickfort config file 2023-01-22 08:40:16 -08:00
20k b15fcc93d2 remove assignments on zone destroy 2023-01-22 15:26:55 +00:00
20k c7ca9d0d7b reverse squad iteration delete 2023-01-22 15:25:16 +00:00
Myk Taylor f862e4a6b7
comment out SEC_SELECT in dialogs 2023-01-22 03:09:07 -08:00
Myk Taylor f0d44342d8
first attempt at a manager orders overlay 2023-01-22 03:08:36 -08:00
eamondo2 96fc53f29d Always with the trailing whitespace 2023-01-22 05:22:43 -05:00
eamondo2 4d876f85b7 Prelim. doc updates. 2023-01-22 05:14:08 -05:00
eamondo2 9bcd9c27bf Fix build failure 2023-01-22 04:55:14 -05:00
eamondo2 2e6ba64f56 Hopefully fix end-of-file-fixer complaint 2023-01-22 04:46:35 -05:00
eamondo2 84f7fc85da trim trailing whitespace 2023-01-22 04:44:33 -05:00
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