Commit Graph

3837 Commits (db004f484dd7bf650a467ffdfc68bb19ca99faf5)

Author SHA1 Message Date
lethosor b6de6f12ec Merge remote-tracking branch 'RosaryMala/remote_reader' into develop 2020-07-13 19:58:33 -04:00
lethosor 07a2b4a9d7 Use language_name_type enum item names 2020-07-11 02:05:38 -04:00
lethosor c30d27cfbd Silence strangemood warnings 2020-07-11 01:41:38 -04:00
lethosor f32757fa09 Update scripts 2020-07-03 22:49:48 -04:00
Ben Lubar 72ce52e004
update structures 2020-07-01 23:10:34 -05:00
Ben Lubar 9def098ef9
add enum-attrs to pronoun_type 2020-06-29 21:30:22 -05:00
Ben Lubar d13e5a3f31
update structures
handle renaming of caste_raw::gender
2020-06-29 20:20:37 -05:00
Ben Lubar a9f219baf9
update for DFHack/df-structures#7dfea1f1d4e453b97d5529785701db46360596ce 2020-06-29 16:16:44 -05:00
Quietust e2301ecae7 Update structures, fix reaction_productst::produce() parms 2020-06-23 13:31:27 -06:00
lethosor aee4fcd1a6 Add confirmation for convicting dwarves of crimes
Closes #1593
2020-06-20 12:06:50 -04:00
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 28c34217d8
Ruby implementation of df-other-vectors-type 2020-05-09 18:28:40 -05: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
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
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 7c1d1c43e5 Merge remote-tracking branch 'PatrikLundell/stocks' into develop
Conflicts:
	docs/changelog.txt
2020-04-25 21:12:27 -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 55a82e43c6 Update xml, fix stockpiles build 2020-04-24 23:50:35 -04:00
lethosor 75c8bf1a59 Indent more 2020-04-22 22:05:48 -04:00
PatrikLundell 07571e9eb4 updated and resolved conflict 2020-04-22 11:43:37 +02:00
Ben Lubar 2f1e057bc7
check-structures-sanity: report known void* types with a better message 2020-04-19 22:03:03 -05:00
Ben Lubar 8427f518c9
match capitalization changes I made to df-structures in specific_ref 2020-04-15 20:05:15 -05:00
PatrikLundell f4f2aa0d5e removed underscores, adapted to structure (re)naming 2020-04-15 10:18:37 +02:00
PatrikLundell b0d184e2f9 Merge branch 'develop' of https://github.com/DFHack/dfhack into Units 2020-04-15 09:45:54 +02:00
Nilsolm 362e49c0bc autogems: check bin content in linked stockpiles 2020-04-12 11:02:26 +02:00
Nilsolm 2b44e52cab Add intrigue skill to manipulator 2020-04-11 16:47:29 +02:00
PatrikLundell 55988e3fc4 adapted to updated structures, remote Using units for age 2020-04-08 08:45:40 +02:00
PatrikLundell 5ce84a76f9 Merge branch 'develop' of https://github.com/DFHack/dfhack into Units 2020-04-08 08:35:58 +02:00
Nilsolm c4853bd6e1 Add search to justice screen 2020-04-06 19:13:18 +02:00
lethosor 4e957eafe2 Merge remote-tracking branch 'ymber/embark-profile-name' into develop 2020-04-04 18:55:12 -04:00
PatrikLundell a0e2abe20a Units update need coordination with structure identity 2020-04-04 14:00:26 +02:00
ymber 9b813aab49
Restore style 2020-04-04 11:17:10 +01:00
ymber 5d032b3d9c
Restore esc abort key 2020-04-04 11:12:51 +01:00
Ben Lubar 845b53d7cd
fix integer signedness differences 2020-04-03 11:50:09 -05:00
ymber 6b603bc644
Update embark-profile-name tweak 2020-04-02 17:57:05 +01:00
lethosor 06201a4c6a Bail out if MALLOC_PERTURB_ is unset to avoid unexpected behavior 2020-04-02 01:48:21 -04:00
lethosor 9b1dddc336 Update xml, scripts, change unit_action.data field names back
Fixes #1520
Makes part of dfhack/scripts#130 unnecessary
2020-03-30 03:00:41 -04:00
Ben Lubar 97916fd55e
implement tagged union structures attributes 2020-03-21 14:29:14 -05:00
Ben Lubar b29d009b14
update structures; implement struct_field_info_extra 2020-03-21 13:21:35 -05:00