Commit Graph

12458 Commits (947863750eb072b3591899bedce0c068c9b5e8b4)
 

Author SHA1 Message Date
Rose 947863750e Comment out all adventure mode stuff. The game doesn't support it anymore anyway, and it will sureley change when it does. 2022-12-26 16:57:19 -08:00
Rose 275e893288 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2022-12-26 16:21:54 -08:00
DFHack-Urist via GitHub Actions e2425b5c7c Auto-update submodules
library/xml: master
scripts: master
2022-12-25 07:13:11 +00:00
DFHack-Urist via GitHub Actions 7625dc132e Auto-update submodules
library/xml: master
scripts: master
2022-12-24 07:13:19 +00:00
lethosor 6a61c750e9
widgets.render_text(): error early if key is invalid
This helps identify _which_ key is invalid - otherwise, getKeyDisplay()
complains that it was called with `nil`, which is less helpful.
2022-12-23 13:17:26 -05:00
lethosor 12804a10a6
Fix Gui/Screen to work with g_src changes (dfhack/df-structures#487) 2022-12-23 00:36:09 -05:00
lethosor c4b31c6fc9
Bump project version to 50.04, try removing leading 0. 2022-12-23 00:01:46 -05:00
DFHack-Urist via GitHub Actions 07a0e6e511 Auto-update submodules
library/xml: master
2022-12-22 19:38:45 +00:00
Myk d4ab4e1631
Merge pull request #2518 from myk002/myk_render_me_pretty
Myk render me pretty
2022-12-22 11:37:51 -08:00
Myk Taylor 52c1e49197
get the text rendering back 2022-12-21 22:13:05 -08:00
Myk Taylor 48a9e1c518 more new var names 2022-12-22 05:16:40 +00:00
Myk Taylor 93c875fb56
adjust to new variable names 2022-12-21 14:07:36 -08:00
Myk Taylor 839e927f9b
comment out problematic code from Renderer 2022-12-21 14:06:58 -08:00
Myk 8dfae274cc
Merge pull request #2515 from myk002/myk_closer_to_goo
prevent "offset" tiles from occluding DFHack-drawn tiles
2022-12-21 10:24:14 -08:00
Myk Taylor e781cc5141
add new viewscreens to overlay 2022-12-20 20:18:00 -08:00
Myk Taylor 010b18c0e4
hide "offset" tiles that we occlude 2022-12-20 20:10:14 -08:00
Myk Taylor 106b55397a
comment out problematic code in Core 2022-12-20 19:04:30 -08:00
DFHack-Urist via GitHub Actions 6c5b7d9458 Auto-update submodules
library/xml: master
2022-12-21 02:44:29 +00:00
Myk Taylor 663e1dd541
ascii is now in color 2022-12-20 16:33:11 -08:00
Myk 0766d85759
Merge pull request #2513 from myk002/myk_more
Get extremely basic ascii rendering working
2022-12-20 14:17:10 -08:00
Myk Taylor d7f51e5ed8
basic text drawing 2022-12-20 11:00:49 -08:00
Myk Taylor 7f91cf6e2a
more instrumentation for eventmanager 2022-12-20 09:49:35 -08:00
DFHack-Urist via GitHub Actions 1e0d09004a Auto-update submodules
scripts: master
2022-12-20 07:14:24 +00:00
Myk 4b45727805
Merge pull request #2512 from myk002/myk_wave2
build wave 1 and 2 plugins
2022-12-19 13:59:49 -08:00
Myk Taylor 999d602e79
instrument eventmanager a bit 2022-12-19 13:43:57 -08:00
Myk Taylor e8a1e10272
build wave 1 and 2 plugins
but don't enable anything by default yet
2022-12-19 13:43:33 -08:00
DFHack-Urist via GitHub Actions 558bf148e2 Auto-update submodules
scripts: master
2022-12-19 07:14:30 +00:00
Kelly Kinkade 767dcb0613
Merge pull request #2510 from myk002/myk_blank_slate
comment out all plugins and default tool init
2022-12-18 22:48:28 -06:00
Myk Taylor a1110ec894
also don't build stonesense, isoworld, dev plugins 2022-12-18 17:31:54 -08:00
Myk Taylor 990f9f6061
comment out all plugins and default tool init
until we can prove things work in v50
2022-12-18 17:25:18 -08:00
DFHack-Urist via GitHub Actions d04e30406f Auto-update submodules
library/xml: master
2022-12-17 23:58:29 +00:00
Kelly Kinkade eef6dcb08c
Merge pull request #2504 from ab9rf/develop
initial 50.03 alpha branch - into the breach we go
2022-12-17 15:51:16 -06:00
Kelly Kinkade 607a4b34d4 update structures 2022-12-17 15:09:08 -06:00
Rose 9a5a9bf0b9 Merge remote-tracking branch 'ab9rf/develop' into develop
# Conflicts:
#	build/.gitignore
2022-12-17 11:55:13 -08:00
Rose eac6dc62ee Update windows build scripts 2022-12-17 11:24:31 -08:00
Kelly Kinkade 57e599a4d9 comment out barracks reference
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
Myk Taylor 5cd60e10f0 comment out problematic code in Gui.cpp 2022-12-16 14:47:43 -06:00
Myk Taylor 003b74bf73 absorb Putnam's work on the windows hooks 2022-12-16 14:47:43 -06:00
Myk Taylor 768c95ecb6 absorb Putnam's work on Screen 2022-12-16 14:47:43 -06:00
Myk Taylor ccc9e976e2 comment out problematic code in Screen.cpp 2022-12-16 14:47:43 -06:00
Myk Taylor 55351951f0 comment out problematic code in Items.cpp 2022-12-16 14:47:43 -06:00
Myk Taylor 93b8479e94 comment out problematic code in Buildings.cpp 2022-12-16 14:47:43 -06:00
Myk Taylor 0953982cfa remove DF download and tests for v50
revert when there is something to download and test
2022-12-16 03:28:42 -06:00
Kelly Kinkade 7fae0fe44f structures 2022-12-15 21:19:40 -06:00
Kelly Kinkade 9587dd42f8 structures update 2022-12-15 19:56:17 -06:00
Kelly Kinkade e6d8f06965 update structures 2022-12-15 19:27:52 -06:00
DFHack-Urist via GitHub Actions 88dffa812e Auto-update submodules
scripts: master
2022-12-15 22:39:14 +00:00
Myk 42203b13f4
Merge pull request #2500 from myk002/myk_panel_drag
Support resizing for DFHack Panel widgets
2022-12-15 14:36:33 -08:00
Kelly Kinkade 48ca5eb66d makefile changes 2022-12-15 03:42:23 -06:00
Kelly Kinkade a07d8c3b15 updates to do test builds of 50.03 2022-12-15 03:35:57 -06:00