Commit Graph

12931 Commits (de262e610a075a46d48432a1bd82a08ebffa2bdf)
 

Author SHA1 Message Date
Scott Ellis de262e610a Fix lint error 2023-01-26 15:05:42 -06:00
Scott K. Ellis 47bad86a6a
Merge branch 'develop' into no-platinum-weapons 2023-01-26 14:57:21 -06:00
Myk Taylor a767a917fa
de-emphasize IRC in our docs 2023-01-26 12:49:22 -08:00
Scott Ellis 54a44e589b Update orders.rst to reflect changes in military.json 2023-01-26 08:15:31 -06:00
Scott Ellis 2ae3d7dd85 Stop creating workorders to create platinum weapons
Platinum weapons are normally only created by artifact moods.
Removed creation of platinum weapons from military.json
Altered other weapon work orders to not care about the existance of
platinum.
Renamed original file for those who want to create platinum weapons
anyway.
2023-01-26 08:09:25 -06:00
DFHack-Urist via GitHub Actions 2a8520fb9e Auto-update submodules
library/xml: master
scripts: master
2023-01-26 07:15:05 +00:00
Myk Taylor be59083202
reduce spacing for CycleHotkeyLabel from 2 to 1 2023-01-25 22:59:29 -08:00
DFHack-Urist via GitHub Actions 33132e5556 Auto-update submodules
library/xml: master
2023-01-25 19:41:45 +00:00
DFHack-Urist via GitHub Actions 15ab59b12d Auto-update submodules
library/xml: master
scripts: master
2023-01-25 07:17:04 +00:00
Myk c21fb0d9ad
Merge pull request #2715 from kelvie/develop
Add Github Actions build of win64 artifacts, and update compile instructions.
2023-01-24 21:53:04 -08:00
Myk Taylor c5f2588522
fix issues with clicks "falling through" scrollbars 2023-01-24 21:28:25 -08:00
Kelvie Wong 5227d29f1f Use GHA caching with ccache 2023-01-24 19:55:15 -08:00
Kelvie Wong a496f88a29 Change $GITHUB_REF to HEAD
GITHUB_REF apparently doesn't work in PR builds.
2023-01-24 19:55:15 -08:00
Kelvie Wong cf11280b8b Simplify cross-compile instructions
Now that users don't have to build the image.
2023-01-24 19:55:15 -08:00
Kelvie Wong a72b26c4f2 GHA: Add win64 cross compile build
This also removes -t from docker run, as we don't actually require a
terminal, this was just muscle memory.

This also archives the artifacts for testing.
2023-01-24 19:55:15 -08:00
Myk 5283cb1e72
Merge pull request #2716 from myk002/myk_channel_safely
fix build errors with channel-safely
2023-01-24 19:01:46 -08:00
Myk 4cd191520a
Merge pull request #2714 from ab9rf/5005-alpha3-tailor
tailor: increased check frequency
2023-01-24 18:55:13 -08:00
Myk Taylor 4e35895cf4
fix build errors with channel-safely 2023-01-24 18:48:23 -08:00
Kelly Kinkade cbcd68317d tailor: increased check frequency
do bookkeepers work faster now? could be
2023-01-24 19:28:17 -06:00
Myk 25658592cb
Merge pull request #2472 from cppcooper/channel-safely
Updates Channel safely
2023-01-24 17:05:40 -08:00
Josh Cooper 739263eb59 Re-introduces channel-safely plugin to the build 2023-01-24 16:25:41 -08:00
DFHack-Urist via GitHub Actions 018715f869 Auto-update submodules
library/xml: master
scripts: master
2023-01-24 19:18:16 +00:00
Myk c58bb2b610
Merge pull request #2704 from myk002/myk_quickcmd
add keybinding for gui/quickcmd
2023-01-24 11:15:51 -08:00
Myk 0ad67dc276
Merge branch 'develop' into myk_quickcmd 2023-01-24 11:15:14 -08:00
Myk 83c89cfaa9
Merge pull request #2705 from myk002/myk_zscreen_redux
Implement new ZScreen semantics
2023-01-24 11:14:43 -08:00
Myk 7a4b41ec4b
Merge pull request #2707 from myk002/myk_enable_no_tab
don't use tabs in enable output
2023-01-24 11:14:18 -08:00
Myk 73be33e0aa
Merge pull request #2709 from Kurkin/patch-1
Update orders.rst
2023-01-24 11:14:01 -08:00
Dmitrii Kurkin cbff07dc37
Update orders.rst 2023-01-24 21:55:22 +08:00
Myk e1fd88b195
Merge pull request #2706 from ab9rf/5005-alpha3-tailor
tailor: avoid bad key exception in std::map
2023-01-23 23:51:36 -08:00
Myk Taylor 0e03ac8e5b
don't use tabs in enable output
so they display nicely in gui/launcher
2023-01-23 23:50:08 -08:00
DFHack-Urist via GitHub Actions d221f2b105 Auto-update submodules
scripts: master
2023-01-24 07:14:02 +00:00
Kelly Kinkade f640d15355 tailor: avoid bad key exception in std::map 2023-01-23 22:40:54 -06:00
Myk Taylor f39eb42889
remove references to pinnable 2023-01-23 19:34:48 -08:00
Myk Taylor 1fa71c0d92
update quickstart guide with new ZScreen semantics 2023-01-23 19:24:37 -08:00
Myk Taylor 1c2f8eccbf
paint pause symbol for force-pause windows 2023-01-23 19:02:26 -08:00
Myk Taylor 0905943ecf
don't unfocus if mouse is not being passed through 2023-01-23 18:05:03 -08:00
Myk Taylor 4377065081
move pause restore to dismiss
and fix the condition
2023-01-23 17:46:03 -08:00
Myk Taylor 8b98ba5042
allow windows to be defocused instead of pinned 2023-01-23 17:40:16 -08:00
Myk Taylor 5ad6ce16e8
don't change definitions of deprecated frame styles 2023-01-23 16:00:10 -08:00
Myk Taylor 21ebbad669
add keybinding for gui/quickcmd 2023-01-23 15:40:56 -08:00
Myk Taylor eab08f6430
update tag for automelt 2023-01-23 14:51:48 -08:00
Josh Cooper 89eefd006f Implements plugin: channel-safely v1.2.2
minor changes only
The largest change is moving a df::map_block* declaration to an outer loop
2023-01-23 14:24:24 -08:00
Josh Cooper ae8291b952 Implements plugin: channel-safely v1.2.1
- Removes insta-dig feature (too many problems, rarely worked)
- Fixes a segmentation fault introduced in v1.2
- Improves manage_group readability/nesting
- Improves manage_one readability/nesting

Update docs/plugins/channel-safely.rst

Co-authored-by: Myk <myk002@yahoo.com>

Fixes some formatting consistency
2023-01-23 14:24:23 -08:00
Josh Cooper a4bf266770 Implements plugin: channel-safely v1.2
- Updates rst documentation
  - Adds feature: risk-averse
- Revises ChannelManager::manage_group
  - Now performs analysis of group designations
    - If any designation has fall space, designations are analyzed for accessibility (a weighted score of how many ways it can be accessed)
    - If a designation has no fall space, but cannot be accessed it will be "dig_now"'ed
    - accessibility scores are stored for the management phase
  - Management loop has been extended
    - iff no cave-in candidates exist, then perform simple management (as requested)
    - if candidates do exist, then we must check if our current position is one
      - if the current position is a cave-in candidate it must also be within range (+2) of the least access
        - if the candidate is in range or on the dignow queue, then we activate the designation and modify the dig priority according to distance from least_access
      - if not a candidate, or the other checks failed, then we set the designation to marker mode
2023-01-23 14:24:23 -08:00
Josh Cooper 540faff88f Implements plugin: channel-safely v1.1.2b
- Updates rst documentation
  - Adds troubleshooting section
  - Renames the monitor feature to monitoring
- Adds cave-in helper functions
  - ChannelJobs::has_cavein_conditions()
  - ChannelJobs::possible_cavein()
  - find_dwarf() ~ finds the nearest dwarf or the first one that has a path to a position
- Moves dignow/resurrect to inlines.h
- Improves management of regular dig designations
- Adds df::job* tracking back into ChannelJobs to simplify cancellations
- Updates/improves debug logging
  - Switches unordered structures with ordered in some locations to have ordered debugging information
- Simplifies ChannelManager::manage_group()
- Fixes up ChannelManager::manage_one()
  - the return value is now useful even if unused
2023-01-23 14:24:23 -08:00
Myk 1b02e66284
Merge pull request #2670 from eamondo2/automelt
Initial automelt implementation
2023-01-23 13:48:53 -08:00
Myk Taylor 5fad172adc
update scripts head 2023-01-23 13:47:30 -08:00
Myk Taylor 73dd0b4489
stronger wording for ZScreen guidance 2023-01-23 13:47:00 -08:00
Eamon Bode 8750707948
Update plugins/automelt.cpp
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-01-23 16:32:47 -05:00
eamondo2 c5ce1b1766 Fix build complaints 2023-01-23 16:20:37 -05:00