Commit Graph

15393 Commits (749ccc518253f93d86bd325cfbbf57901a8eda9e)
 

Author SHA1 Message Date
Ben Lubar 85855a2d88
update structures 2020-06-21 16:16:16 -05:00
Kelly Kinkade 61a00f7809 stupid whitespace 2020-06-20 23:10:44 -05:00
Ben Lubar 7b4ae9b6a3
update structures 2020-06-20 23:08:55 -05:00
Kelly Kinkade 7ddc3bb918 fix labor inferences for custom furnaces
Also clean up how paved roads are handled (the way it was was stupid)
2020-06-20 23:05:55 -05:00
lethosor aee4fcd1a6 Add confirmation for convicting dwarves of crimes
Closes #1593
2020-06-20 12:06:50 -04:00
Ben Lubar 5073bd31c4
update structures 2020-06-19 19:37:54 -05:00
lethosor 861c8c8148 Remove -q from docs/build.sh to make -v work 2020-06-17 20:36:07 -04:00
lethosor 97a20acf1b Add current year to docs copyright message 2020-06-17 20:32:30 -04:00
Ben Lubar bd216dbc11
update structures 2020-06-15 23:47:35 -05:00
PatrikLundell d5a491e852 fixed parameter bugs 2020-06-07 08:38:12 +02:00
PatrikLundell 4a48c356a9 fixed bug with incursion handling along world tile edges 2020-06-02 15:58:46 +02:00
PatrikLundell dda31c06db merged 2020-06-02 15:08:02 +02:00
PatrikLundell d5b5b81450 changes 2020-06-02 15:03:59 +02:00
Ben Lubar 5d05cfc7cc
Fix several functions in the Units module ignoring unit caste.
Fixes #1583.
2020-06-02 01:18:57 -05:00
lethosor 2fc7fa7ac2 Update xml, scripts
See #1576
2020-05-28 23:11:08 -04:00
Rose ad37354211 Bump version number to make sure the updater works. 2020-05-24 15:42:59 -07:00
PatrikLundell 4e97269312 Merge branch 'develop' of https://github.com/DFHack/dfhack into Units 2020-05-23 10:25:08 +02: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
PatrikLundell ec7f97bb7a adapted to enum value name change 2020-05-02 17:37:10 +02:00