Commit Graph

13825 Commits (00445767c74eb21600971ffd0699921e2b43300d)
 

Author SHA1 Message Date
Josh Cooper 5d8d378917 Implements plugin: channel-safely v1.2.3
- Revises a few log lines
- Adds d_assert macro to replace assert usage
  - prints an error to indicate d_assert failed in Release builds as well as Debug builds
  - could be added to the Debug utilities to allow use of assertions on necessary code without needing to buffer the results for use in the assert statement
- Fixes bug wherein designations are never put into marker mode (related to the assert statements)
2023-02-08 12:03:40 -08:00
Myk 26e1d1806f
Merge pull request #2842 from myk002/myk_logo
update logo to crisper version provided by TaxiService
2023-02-08 11:32:27 -08:00
Myk cfc5226aaf
Merge branch 'develop' into myk_logo 2023-02-08 11:21:37 -08:00
Myk ccf57fd961
Merge pull request #2845 from dawnmist/orders/remove-silver-crossbow-from-military
Remove silver crossbow work-order from library/military
2023-02-08 11:19:47 -08:00
Myk 201fec6873
Merge pull request #2837 from robob27/case-insensitive-filterlist
Add case_sensitive attr to FilteredList
2023-02-08 11:18:31 -08:00
pre-commit-ci[bot] bf0b3f8845 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-08 19:06:35 +00:00
eamondo2 02a249fdee Fixes the lua stack smashing issue 2023-02-08 14:01:32 -05:00
Robob27 b950b56926 Add methods to HotkeyLabel 2023-02-08 13:00:13 -05:00
Robob27 22b31bd7f1 Update changelog 2023-02-08 12:40:37 -05:00
eamondo2 5002427bec Merge branch 'develop' into automelt 2023-02-08 10:26:55 -05:00
Janeene Beeforth 1f38b294cb Add note in changelog about silver crossbows 2023-02-08 21:24:24 +11:00
Janeene Beeforth 24827eabe2 Remove checks for silver from library/military for crossbows. 2023-02-08 21:24:24 +11:00
Janeene Beeforth dd10451c2f Remove library/military silver crossbow work-order
It is not possible to create a work-order for making silver crossbows,
so the silver crossbow recipe belongs in the alternative military library
with other artifact/non-craftable weapon recipes.

It's already present in the library/military_include_artifact_materials
work-orders, so simply needed removal from the vanilla library/military
orders version.
2023-02-08 21:24:24 +11:00
Robob27 54560bc5db Don't duplicate regex 2023-02-08 03:39:43 -05:00
Robob27 13440d18a8 Add case_sensitive to FilteredList docs 2023-02-08 03:39:43 -05:00
Robob27 c1b9de87d2 Add case_sensitive attr to FilteredList 2023-02-08 03:39:43 -05:00
DFHack-Urist via GitHub Actions d0b4b1a4a5 Auto-update submodules
library/xml: master
2023-02-08 07:36:55 +00:00
DFHack-Urist via GitHub Actions 585b8da03a Auto-update submodules
scripts: master
2023-02-08 07:15:14 +00:00
eamondo2 9925aba3e4 Merge branch 'develop' into automelt 2023-02-08 02:00:14 -05:00
eamondo2 be0cec9520 Current attempt to fix lua stack smashing 2023-02-08 01:59:57 -05:00
Myk Taylor 0a91166a92
add light AA 2023-02-07 22:55:19 -08:00
Myk Taylor 8ee05af6ef
update logo to crisper version provided by TaxiService 2023-02-07 22:55:19 -08:00
lethosor 057d2d8c5d
Update scripts (hermit) 2023-02-08 00:00:52 -05:00
lethosor 468e9875e5
Update DFHack version to 50.07-alpha0, update xml 2023-02-08 00:00:31 -05:00
Myk Taylor ef81a91181
only realign out-of-alignment list positions 2023-02-07 14:12:52 -08:00
DFHack-Urist via GitHub Actions b2ecb8aaab Auto-update submodules
library/xml: master
scripts: master
2023-02-07 20:53:12 +00:00
DFHack-Urist via GitHub Actions df5184d751 Auto-update submodules
library/xml: master
scripts: master
2023-02-07 07:14:45 +00:00
Myk d126cbec7a
Merge pull request #2836 from DFHack/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-02-06 17:55:50 -08:00
pre-commit-ci[bot] bc1adc0300
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/python-jsonschema/check-jsonschema: 0.19.2 → 0.21.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.19.2...0.21.0)
- [github.com/Lucas-C/pre-commit-hooks: v1.3.1 → v1.4.2](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.3.1...v1.4.2)
2023-02-07 01:38:55 +00:00
Myk 26e57a9780
Merge pull request #2834 from TealSeer/zonecheckfixes
Fix logic for zone type checks and re-enables autonestbox
2023-02-06 16:21:17 -08:00
Roxy 826f918954 remove isHospital as hospitals are no longer civzones 2023-02-06 19:11:00 -05:00
Roxy ca5a17a799 explanatory comment for magic number 2023-02-06 19:09:47 -05:00
Roxy 0043e05895 enable autonestbox 2023-02-06 16:47:50 -05:00
Roxy a38246aaa4 Update logic for zone type checks 2023-02-06 16:47:50 -05:00
Myk c0358d642d
Merge pull request #2833 from myk002/myk_list_recenter
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:57:43 -08:00
Myk cd9972c442
Merge pull request #2832 from johncosker/cycle-hotkey-rev
Add 'key_back' optional hotkey for CycleHotkeyLabel to allow cycling backwards.
2023-02-06 12:55:27 -08:00
Myk Taylor 0b9b258224
ensure scrollable lists are centered in the visible viewport 2023-02-06 12:54:05 -08:00
John Cosker f91555d5e3 Add brackets to indicate optional param 2023-02-06 15:44:50 -05:00
John Cosker 0ed4a1c540 Add documentation to cycle() for new parameter 2023-02-06 15:44:04 -05:00
John Cosker fdf1d38b23 Merge branch 'cycle-hotkey-rev' of https://github.com/johncosker/dfhack into cycle-hotkey-rev 2023-02-06 15:13:13 -05:00
John Cosker 36391af27c More cleanup 2023-02-06 15:12:47 -05:00
John Cosker 0769afc961
Merge branch 'develop' into cycle-hotkey-rev 2023-02-06 15:04:57 -05:00
John Cosker 39dc0ccc8a Cleanup 2023-02-06 15:03:28 -05:00
John Cosker e1f74ab068 Tweak to completely nil the key_back table for setText if not set 2023-02-06 14:53:26 -05:00
Myk f602548540
Merge pull request #2831 from ElsaTheHobo/develop
Delete makeown.lua
2023-02-06 11:06:38 -08:00
ElsaTheHobo d09f8553a0 Delete makeown.lua 2023-02-06 13:34:31 -05:00
Myk a9ef17152f
Merge pull request #2816 from myk002/myk_logo_hide
hide DFHack logo when it's in the way
2023-02-06 09:17:56 -08:00
Myk 190b5003c8
Merge branch 'develop' into myk_logo_hide 2023-02-06 09:17:48 -08:00
Myk 041909dfa7
Merge pull request #2822 from myk002/myk_rclick
prevent rclick from bleeding through (again)
2023-02-06 09:17:28 -08:00
Myk 448598e391
Merge pull request #2823 from myk002/myk_hotkey_guards
implement some Gui module hotkey guards
2023-02-06 09:17:18 -08:00