Commit Graph

9526 Commits (437923bd2ef2a3e072ac8eaa0e1f177695116c7e)
 

Author SHA1 Message Date
Rose ad37354211 Bump version number to make sure the updater works. 2020-05-24 15:42:59 -07:00
Rose b3080c73ca Merge remote-tracking branch 'DFHack/develop' into remote_reader 2020-05-22 08:06:33 -07:00
Rose 6e2f71b10f Merge branch 'remote_reader' of https://github.com/RosaryMala/dfhack into develop 2020-05-22 08:04:38 -07:00
Rose 3db490ee9e Fix a problem where the block coordinates would sometimes not get copied. 2020-05-22 08:01:34 -07:00
Ben Lubar f20446534b
fix DfOtherVectors computed size 2020-05-14 14:01:12 -05:00
Ben Lubar 7dd4b6d968
update structures 2020-05-14 13:07:11 -05:00
Ben Lubar acae3982db
Merge branch 'other-vectors' into develop 2020-05-14 13:06:58 -05:00
lethosor 3698450605 Merge branch 'doc-updates' into develop 2020-05-13 22:59:05 -04:00
lethosor d189b91f49 Update macOS -> OS X, tweak a bit and add more anchors 2020-05-13 22:58:32 -04:00
lethosor 7a9be264c6 Update Linux GCC docs and some ninja notes 2020-05-13 22:46:09 -04:00
lethosor df06f31137 Update forum thread link 2020-05-13 22:25:56 -04:00
lethosor 94d7f3b347 Update docs on cloning and git stuff 2020-05-13 22:25:42 -04:00
Ben Lubar 28c34217d8
Ruby implementation of df-other-vectors-type 2020-05-09 18:28:40 -05:00
Ben Lubar 6c20fe4c80
implement df-other-vectors-type for lua 2020-05-09 18:28:40 -05:00
Ben Lubar 7cf9624de9
add assert to make sure other_id array index is in bounds 2020-05-09 18:28:40 -05:00
Ben Lubar fc10ed3df6
Implementation for df-other-vectors-type in C++. Still needs Lua and Ruby support. 2020-05-09 18:28:40 -05:00
Ben Lubar 0ffafbde29
update structures 2020-05-09 18:28:19 -05:00
Ben Lubar 1058e40cb0
Enable /bigobj globally on MSVC.
This changes the intermediate format used for compiled files from one
that can hold up to 65279 (slightly less than 2^16) addressable sections
to one that can hold 4294967296 (2^32).

Code that uses templates, such as... C++ code... can easily run up
against the smaller limit. This does not affect the finished executable,
only the intermediate object files.
2020-05-09 18:23:18 -05:00
PatrikLundell 31d984e934 Fixed 2 incursion handling bugs 2020-05-05 10:21:56 +02:00
PatrikLundell fb1dc1aea6 Merge branch 'develop' of https://github.com/DFHack/dfhack into embark-assistant 2020-05-05 10:02:02 +02:00
lethosor d0c030c3da Update xml (changelog only) 2020-05-04 19:27:17 -04:00
lethosor f3b3cb1b33 Remove fast_mutex from CMakeLists 2020-05-04 19:26:49 -04:00
lethosor 1dc2d4b6aa Remove tthread::fast_mutex entirely
This can deadlock on Linux, per be517370a6, and rendermax was the only tool that used it
2020-05-04 18:41:59 -04:00
lethosor be517370a6 rendermax: move to std::mutex
fast_mutex can deadlock on Linux with optimization enabled
2020-05-04 18:38:54 -04:00
lethosor af33f71aa2 Update changelog
Includes #1561/#1566
2020-05-03 22:54:43 -04:00
lethosor 42734fc6aa Merge remote-tracking branch 'ab9rf/lm-1561' into develop 2020-05-03 22:50:12 -04:00
Kelly Kinkade 2dfd7ea0d0 Update labormanager.cpp again
These should probably be OTHER rather than BUSY.
2020-05-03 18:19:49 -05:00
Kelly Kinkade 319354f6cd Update labormanager.cpp
Add entries for jobs 241-243 to the `dwarf_states` vector as well, derp.
2020-05-03 18:16:31 -05:00
Kelly Kinkade 866660169e Update joblabormapper.cpp
Add no-labor mappings for new jobs 241 through 243.
2020-05-03 17:53:32 -05:00
JapaMala 63c7b69b5b Change item improvement type to bare ints. 2020-05-02 14:38:55 -07:00
JapaMala 60853a543d Remove the site realization building type from the remote reader spec. It has no business being there. 2020-05-02 13:28:28 -07:00
JapaMala 2762f75d69 Merge remote-tracking branch 'dfhack/develop' into develop 2020-05-02 10:58:41 -07:00
JapaMala fcc4962052 Update stonesense to not crash. 2020-05-02 10:58:07 -07:00
Ben Lubar 1c57aa7bb4
update structures 2020-05-02 02:01:32 -05:00
Ben Lubar 947d0db182
update structures 2020-05-02 01:54:38 -05:00
lethosor 217535decb Update xml 2020-05-01 22:52:35 -04:00
lethosor 1dc59d3772 Ruby: use core methods for finding selected item and building
Similar to c3d566332, the core methods have become more complicated (and are also checked at compile-time). This will give a more consistent experience across scripts.

Fixes #1563
2020-05-01 22:50:02 -04:00
lethosor 24cebbda58 Fix segfault when setting DFHACK_HEADLESS but not PRINT_MODE:TEXT
endwin() is unhappy if initscr() wasn't called
2020-04-28 21:38:47 -04:00
lethosor 2108c2363d Use strcmp 2020-04-28 01:21:11 -04:00
lethosor 9e085b66ac Merge branch 'develop' into lua-ref-target 2020-04-27 23:24:29 -04:00
lethosor 6bdbf5b0dd Update to 0.47.04-r1, update xml, scripts, changelog version 2020-04-25 21:33:02 -04:00
lethosor f76b890cc8 Ensure that dev changelogs are also sorted, since they are pulled in from multiple files now 2020-04-25 21:18:35 -04:00
lethosor 7a2ef4ff60 Update scripts 2020-04-25 21:14:27 -04:00
lethosor 7c1d1c43e5 Merge remote-tracking branch 'PatrikLundell/stocks' into develop
Conflicts:
	docs/changelog.txt
2020-04-25 21:12:27 -04:00
lethosor 3380f9ccf4 Update changelog 2020-04-25 21:03:32 -04:00
lethosor 02c118335f Restore build-lua.sh for build-env 2020-04-25 17:59:50 -04:00
lethosor f008da32f8 Update submodules 2020-04-25 17:58:09 -04:00
lethosor 1546d9ec1a Tweak docs from #1484 2020-04-25 02:41:27 -04:00
lethosor 4dce9f2010 Merge remote-tracking branch 'PatrikLundell/getplants' into develop
Merges #1484

Conflicts:
	docs/changelog.txt
2020-04-25 02:39:05 -04:00
lethosor 405af5a20b Update structures 2020-04-25 02:01:21 -04:00