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

14229 Commits (c3326d11fa97e67ef372d2d8abca813eedaa1e28)
 

Author SHA1 Message Date
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
Myk 5846c3fc12
Update changelog.txt 2023-04-01 22:11:38 -07:00
Myk 43ce62e27a
Merge branch 'develop' into patch-6 2023-04-01 22:10:26 -07:00
TaxiService 8d8a4abd13
reverted loss of readability 2023-04-02 02:33:09 +02:00
TaxiService e3bab1eb6b
simplifying character definition even more 
removed those pesky superfluous consts and casts...
 2023-04-01 23:40:45 +02:00
TaxiService 3a6893de53
attempt to increase code readability 
following lethosor and myk's suggestions, each symbol now is its own constant with a descriptive name.
...will it work though?
 2023-04-01 16:43:05 +02:00
Myk Taylor d13dfd7d49
interpret shrubbery as floor instead of wall 2023-03-31 19:29:01 -07:00
DFHack-Urist via GitHub Actions 92438ed98c Auto-update submodules 
scripts: master
 2023-04-01 02:26:16 +00:00
Myk 961b815d9f
Merge pull request #3143 from ab9rf/develop 
update steam launcher
 2023-03-31 19:25:08 -07:00
Kelly Kinkade 51236f90fa update steam launcher 
this version launches dwarf fortress via the steam client

the existing one doesn't set up the steam app context which means access  to DF's steam workshop is broken. launching through the steam client avoids this issue.
 2023-03-31 21:05:19 -05:00
TaxiService 18f1b5c675
attempt#2 to fix masterwork/exceptional/decorated symbols 
this time we're using a couple of `static_cast<char>(...)` thingies
 2023-03-31 17:33:23 +02:00
Myk Taylor 38d4eea7ac
bump to 50.07-beta2 2023-03-31 05:02:02 -07:00
Myk 4e96a9d9da
Merge pull request #3135 from myk002/myk_is_such_a_tool 
fix items not being filtered correctly in item selection screen
 2023-03-31 04:51:59 -07:00
Myk Taylor 99e2e596c0
use normalized specials vector 2023-03-31 04:47:54 -07:00