MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,886 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

13886 Commits (cbf1e236721ee79f212d504ccfb6428d5c763208)
 

Author SHA1 Message Date
Taxi Service b56a8b6c17 Merge branch 'bplan_planneroverlay' of https://github.com/TaxiService/dfhack into bplan_planneroverlay 
resolve conflict in changelog.txt
 2023-04-06 16:22:19 +02:00
Taxi Service f66c60ee65 removed some trailing whitespace... 2023-04-06 16:22:07 +02:00
TaxiService 7927820e40
Merge branch 'develop' into bplan_planneroverlay 2023-04-06 16:12:40 +02:00
Taxi Service 70b8c83178 highlight selected item, + various tweaks 2023-04-06 16:08:09 +02:00
DFHack-Urist via GitHub Actions 1ed25cdd72 Auto-update submodules 
scripts: master
 2023-04-06 07:12:58 +00:00
Myk 30bb3d7050
Merge pull request #3168 from myk002/myk_script_paths 
read mods from all mod dirs and only use most recent versions
 2023-04-05 15:54:24 -07:00
TaxiService c490a9ebc2
updated comments in the footer area 2023-04-05 15:55:47 +02:00
TaxiService e1227faca9
Merge branch 'DFHack:develop' into bplan_itemselection 2023-04-05 15:39:23 +02:00
TaxiService faf2553a92
Merge branch 'DFHack:develop' into bplan_planneroverlay 2023-04-05 11:25:08 +02:00
Myk bb5039d648
Merge pull request #3160 from silverflyone/develop 
Fix to read access violation in StockpileIterator::operator++
 2023-04-04 22:55:55 -07:00
Myk 7294678e27
Update docs/changelog.txt 2023-04-04 22:42:58 -07:00
silverflyone d42d9ec626 Update changelog.txt 
Fix log entry
 2023-04-05 12:53:39 +10:00
silverflyone 4aa5e9d17b Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop 2023-04-05 12:23:20 +10:00
silverflyone 37d6a05aea
Merge branch 'develop' into develop 2023-04-05 11:49:38 +10:00
silverflyone 2bd24efa4b Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop 2023-04-05 11:49:30 +10:00
silverflyone 0cebad1078 Update Buildings.cpp 
Removed extra min/max checks.
 2023-04-05 11:49:14 +10:00
Taxi Service 78d5b2690a Merge branch 'bplan_planneroverlay' of https://github.com/TaxiService/dfhack into bplan_planneroverlay 2023-04-04 22:36:21 +02:00
Taxi Service 8708e1fe72 Merge branch 'develop' of https://github.com/TaxiService/dfhack into bplan_planneroverlay 2023-04-04 22:35:34 +02:00
Taxi Service 0c91644c5e various tweaks and fixes 2023-04-04 22:34:47 +02:00
TaxiService 59b7947230
removed trailing whitespace... 2023-04-04 18:31:04 +02:00
Taxi Service eda88a87ef Merge branch 'bplan_itemselection' of https://github.com/TaxiService/dfhack into bplan_itemselection 2023-04-04 18:27:15 +02:00
TaxiService e8e77e9ec2
Merge branch 'DFHack:develop' into bplan_itemselection 2023-04-04 18:25:54 +02:00
Taxi Service aa8870fcad custom EditField & reorganized panels 2023-04-04 17:38:38 +02:00
DFHack-Urist via GitHub Actions d12938fb23 Auto-update submodules 
library/xml: master
scripts: master
 2023-04-04 07:13:18 +00:00
Myk b20547aa77
Merge pull request #3170 from DFHack/pre-commit-ci-update-config 
[pre-commit.ci] pre-commit autoupdate
 2023-04-03 21:58:25 -07:00
pre-commit-ci[bot] 0cf4497328
[pre-commit.ci] pre-commit autoupdate 
updates:
- [github.com/python-jsonschema/check-jsonschema: 0.21.0 → 0.22.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.21.0...0.22.0)
- [github.com/Lucas-C/pre-commit-hooks: v1.4.2 → v1.5.1](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.4.2...v1.5.1)
 2023-04-04 02:55:13 +00:00
TaxiService 0e3df4e3a5
Update docs/changelog.txt 
Co-authored-by: Myk <myk.taylor@gmail.com>
 2023-04-04 03:28:23 +02:00
TaxiService e8fb2c5a46
Update docs/changelog.txt 
Co-authored-by: Myk <myk.taylor@gmail.com>
 2023-04-04 01:37:03 +02:00
Myk Taylor cf847109ce
read mods from all mod dirs and only use most recent versions 2023-04-03 15:59:42 -07:00
Myk a1f41c4992
Merge pull request #3167 from TaxiService/develop 
clean up Items.cpp quality symbols definitions
 2023-04-03 15:26:42 -07:00
Taxi Service 824f7ed038 clean up Items.cpp quality symbols definitions 2023-04-04 00:08:01 +02:00
Taxi Service 8860ddf982 planneroverlay: initial rework commit 2023-04-03 22:46:31 +02:00
Taxi Service ea9f3ef9d1 restored pens.lua (has nothing to do with itemselection) 2023-04-03 22:27:50 +02:00
Taxi Service 07a4da6573 reworked itemselection ui & added vertical divider pens 2023-04-03 22:23:32 +02:00
Myk d9b6e3b3f0
Merge pull request #3161 from TaxiService/bplan_frames 
added BOLD_FRAME and INTERIOR_MEDIUM_FRAME
 2023-04-03 12:31:54 -07:00
TaxiService 3628f8c554
Update docs/changelog.txt 
YES PLS

Co-authored-by: Myk <myk.taylor@gmail.com>
 2023-04-03 21:29:24 +02:00
Taxi Service 4dc7b3cc43 attempt to make changelog entry work 2023-04-03 21:25:59 +02:00
Taxi Service 57146c527a added changelog entry 2023-04-03 21:20:45 +02:00
Myk 678ed5c9d4
Merge pull request #3162 from TaxiService/bplan_misctweaks 
buildingplan: miscellaneous tweaks
 2023-04-03 11:56:49 -07:00
Taxi Service d04780ee86 tweaked some item names shown on buildingplan uis 2023-04-03 20:38:57 +02:00
Taxi Service 935bc235b6 fixed vertical divider characters in ascii mode 2023-04-03 20:37:45 +02:00
Taxi Service 7c63ea9394 added BOLD_FRAME and INTERIOR_MEDIUM_FRAME 2023-04-03 20:13:57 +02:00
silverflyone c6fc55f98f
Merge branch 'DFHack:develop' into develop 2023-04-04 03:45:23 +10:00
silverflyone 181f0bdf72 Update Buildings.cpp 
Boundary checks added.
 2023-04-04 03:27:32 +10:00
silverflyone f8de51aba3 Update Buildings.cpp 
Fixes #3159.
Valid map coordinates from (0, 0, 0) to (world->map.x_count - 1, world->map.y_count - 1, world->map.z_count - 1).
Stockpile coords (x1, y1, z) to (x2, y2, z) may lie outside of this region.
Use min of (0, 0) and max of (world->map.x_count - 1, world->map.y_count - 1) when iterating the block.
 2023-04-04 03:08:43 +10:00
Myk 7d293c89a2
Merge pull request #3148 from myk002/myk_hotkey_menu 
[hotkeys] adjust text margin in popup menu for wide scrollbar
 2023-04-02 09:48:16 -07:00
DFHack-Urist via GitHub Actions 40a6d968bf Auto-update submodules 
scripts: master
 2023-04-02 07:12:31 +00:00
Myk Taylor 55f7643381
use the defined constant instead of a magic number 2023-04-01 23:52:20 -07:00
Myk Taylor 9461e609a0
adjust text margin in hotkey menu for wide scrollbar 2023-04-01 22:53:35 -07:00
Myk 58d8d887f2
Merge pull request #3137 from TaxiService/patch-6 
fix masterwork/exceptional/decorated symbols
 2023-04-01 22:13:55 -07:00