Commit Graph

3829 Commits (c30d27cfbd6c560bd922ad01f7a8c94ce2d525f4)

Author SHA1 Message Date
PatrikLundell af26f7dc6e Added intrusion calculations for world edges 2019-07-14 16:11:51 +02:00
PatrikLundell 6f5abc79e9 Restored install-debug contents and removed offensive white space 2019-07-12 22:38:12 +02:00
PatrikLundell 8248832cbc Added detection and use of incursions into embark tiles 2019-07-12 22:09:03 +02:00
lethosor c125926727 Update submodules and Authors.rst
Ref #1432
Ref dfhack/stonesense#54
Ref dfhack/scripts#93
2019-07-10 19:21:23 -04:00
PatrikLundell 53cf1136fb Waterfall detection changed 2019-07-01 13:30:16 +02:00
PatrikLundell 134bcf09a9 Waterfall detection changed. Aquifer display changed 2019-07-01 13:29:53 +02:00
PatrikLundell bcb62697c9 Waterfall detection changed 2019-07-01 13:29:19 +02:00
PatrikLundell fae5e894ae Waterfall detection changed 2019-07-01 13:29:07 +02:00
PatrikLundell 242f6fbc38 Waterfall detection changed 2019-07-01 13:28:54 +02:00
PatrikLundell 092c9f965b Waterfall detection changed 2019-07-01 13:28:40 +02:00
PatrikLundell 716fe90312 Modified Flat detection options 2019-06-23 18:36:18 +02:00
PatrikLundell 3139d0d3c7 Modified Flat detection options 2019-06-23 18:36:10 +02:00
PatrikLundell 8259243d2a Modified Flat detection options 2019-06-23 18:35:59 +02:00
PatrikLundell 3f7d11d1c7 Modified Flat detection options 2019-06-23 18:35:48 +02:00
PatrikLundell 3e97643b37 Modified Flat detection options 2019-06-23 18:35:28 +02:00
PatrikLundell b5e38451de Modified Flat detection options 2019-06-23 18:35:11 +02:00
PatrikLundell 488f1cd8a1 Fixed bug causing minerals below magma sea being reported 2019-06-20 15:50:11 +02:00
PatrikLundell f09f3a2d25 Prettified by adding a blank 2019-06-06 20:57:21 +02:00
PatrikLundell cde8ffd0fd Fixed materials vector length determination 2019-06-06 20:56:47 +02:00
lethosor f668914db8 kittens: fix compiling on Windows thanks to @ragundo 2019-06-01 17:30:26 -04:00
lethosor 5b11d14c6c Rename save/load to "save data"/"load data" 2019-05-29 19:52:03 -04:00
lethosor ceebef5fe2 Merge branch 'develop' into persist 2019-05-28 21:08:16 -04:00
Joel "The Merciless" Meador cddfb87e22 Make unit_ishostile always return a non-nil value
Have been messing with this function in the dfhack repl and when it returns nil it's hard to know what that means unless you have also already read the code. So this handles a couple spots in `unit_ishostile` that previously just returned false-ey `nil`s to return `false`
2019-05-21 10:48:28 -04:00
JapaMala 8ea3877ace Merge remote-tracking branch 'dfhack/develop' into auto_clothing 2019-05-18 09:12:22 -05:00
lethosor 92717a7f71 mousequery: Fix some more instances of map boundary checks 2019-05-16 23:30:03 -04:00
lethosor c3b06b81c7 mousequery: use map dimensions to determine edge scrolling locations
TWBT modifies the map dimensions, so using the window dimensions to handle edge
scrolling produces the wrong behavior when using a larger map tileset than text
tileset.
2019-05-16 23:22:11 -04:00
lethosor f2bd697d64 mousequery: give explicit feedback when enabling/disabling sub-features
The behavior of this plugin is somewhat unintuitive - "mousequery edge" disables
the edge-scrolling feature instead of enabling it. This should avoid confusion
without breaking compatibility with existing init scripts.
2019-05-13 19:21:57 -04:00
JapaMala 860be4a04a Fix issues with following the screen when using TWBT 2019-05-12 17:05:02 -05:00
JapaMala ae91e17e3e Consider the unit's current job for facing. 2019-05-04 14:35:28 -05:00
JapaMala 19772b7a43 bump version number for future AV updates to pick up on. 2019-05-04 10:29:02 -05:00
JapaMala 475b07e3ce Merge branch 'develop' into remote_reader 2019-05-04 10:25:58 -05:00
JapaMala 42226342dc Save state in persistent data. 2019-04-27 21:01:12 -05:00
JapaMala 6bed392331 Satisfy travis. 2019-04-27 16:58:21 -05:00
JapaMala 64e0884d95 Don't keep re-adding the job orders. 2019-04-27 16:29:30 -05:00
JapaMala 1b387a8ccf Got initial working version. 2019-04-27 15:56:58 -05:00
JapaMala 51b9d7a275 able to set clothing requirements via console. 2019-04-27 14:31:37 -05:00
JapaMala c997f666bb Fix wrong pointer dereference. 2019-04-27 14:15:45 -05:00
JapaMala f07f65a1a3 Silk, yarn, and strands are also soft. 2019-04-27 13:50:52 -05:00
JapaMala 25f767b96b match material categories with valid clothing materials. 2019-04-27 13:48:14 -05:00
JapaMala cae4f6d091 simplified the setItemFromName function 2019-04-27 12:41:25 -05:00
JapaMala b2d59fd143 Parse item name 2019-04-27 12:22:51 -05:00
JapaMala 74daa6bced add missing parentheses. 2019-04-27 11:20:36 -05:00
JapaMala 14ff66d551 Split up the big update function to satisfy codefactor. 2019-04-27 11:11:16 -05:00
JapaMala eb04d513b4 Got basic logic for checking and processing clothing orders. Not done: actually adding orders to the list. 2019-04-27 11:02:50 -05:00
JapaMala a3eafbbc1b <map> is not capitalized 2019-04-27 09:24:52 -05:00
JapaMala f89a3db6fe Loop through citizens to find owned items. 2019-04-27 08:56:50 -05:00
JapaMala 78bd70c858 Loop through all owned items of all units. 2019-04-27 07:53:23 -05:00
JapaMala bc05c9b1a1 started work on new plugin 2019-04-27 06:59:27 -05:00
JapaMala 4347fb0be7 Use size_t for vector size comparisons. 2019-04-18 23:30:03 -05:00
JapaMala 6565a3a2ba Add wounds to RFR 2019-04-18 21:49:18 -05:00
JapaMala 435f92d1bb Add protobuf files to the build solution so they show up in visual studio 2019-04-18 21:48:36 -05:00
Alan a40adf1f86
Merge pull request #1435 from cppcooper/cxxrandom-rel
[Release] cxxrandom v2.0.1
2019-04-16 12:04:40 -04:00
Josh Cooper 9c403f509d [Release] cxxrandom v2.0.1 2019-04-15 16:21:54 -07:00
JapaMala e8624aa814 Fixed a typo. 2019-04-14 01:14:46 -05:00
JapaMala ffab2d83b9 Update protobuf metadata 2019-04-14 00:23:47 -05:00
JapaMala 9e3b2fce49 Update scripts and stonesense 2019-04-13 23:52:05 -05:00
JapaMala 1d147015a6 Bump RFR api version 2019-04-07 23:05:35 -05:00
JapaMala 61396a57ab Push over dwarf's ages through protos 2019-04-07 22:52:50 -05:00
lethosor c11f2b5ffa Update stonesense (fix non-Linux builds) 2019-03-28 14:01:28 -04:00
lethosor 3a9fea9c52 Update stonesense 2019-03-28 11:09:46 -04:00
JapaMala 571ce0f616 Repport if the game is not safe to interact with, namely while saving or loading the game. 2019-03-22 22:52:59 -05:00
JapaMala 064b6959e4 Fixed a crash when a unit has a move action queued, but the path is zero length 2019-03-17 18:05:12 -05:00
Pauli f0632347d0 Remove Core.h include from DataDefs.h
Core.h isn't required for DataDefs.h which removes Core.h dependency
from DataStatics*.
2018-12-30 17:08:42 -05:00
JapaMala c01dbc7cd2 Merge remote-tracking branch 'dfhack/master' into remote_reader
# Conflicts:
#	docs/changelog.txt
#	scripts
2018-12-28 00:08:13 -06:00
lethosor 315852a251 labormanager: fix -Wreorder warning 2018-12-27 19:46:36 -05:00
lethosor 3e2c898e1a Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
Also move changelog entries to misc improvements per #1383
2018-12-27 16:52:30 -05:00
Lethosor 58fd98cb12
Merge pull request #1386 from billw2012/lm-disable-labor
labormanager: add option to disable the management of a labor.
2018-12-27 16:49:01 -05:00
lethosor 32edeffc3f Remove unused find_package(Threads) 2018-12-27 16:31:57 -05:00
lethosor a2f8742128 Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
Also fix and reorganize changelog
2018-12-27 16:28:25 -05:00
JapaMala 368d70c2d7 Use VIRTUAL_CAST_VAR correctly. 2018-12-26 01:10:51 -06:00
JapaMala 84578d7052 Remove both debug dump functions. They aren't needed anymore. 2018-12-26 01:04:31 -06:00
JapaMala e6f7900c52 Force UTF-8 string literals. 2018-12-26 00:39:16 -06:00
JapaMala 45985fe5a9 Merge remote-tracking branch 'dfhack/develop' into remote_reader 2018-12-26 00:23:05 -06:00
JapaMala d73124ebf7 Use FOR_ENUM_ITEMS instead of the silly for loop I had. 2018-12-26 00:14:38 -06:00
JapaMala 4b7e0d3c56 Convert unicode to escaped characters, and some formatting niceness 2018-12-26 00:11:08 -06:00
JapaMala 701ac66f8e Update DF version define. (mainly used to be able to keep backwards compatibility) 2018-12-26 00:06:49 -06:00
JapaMala 95d3086fe6 Remove tabs 2018-12-26 00:05:17 -06:00
Lethosor 0209e76f19
Merge pull request #1385 from ab9rf/labormanager-cleaning
labormanager: assign more dwarves to cleaning
2018-12-23 23:14:53 -05:00
lethosor 92482d63f5 Merge remote-tracking branch 'ab9rf/nestboxes' into develop 2018-12-20 20:57:09 -05:00
Warmist b1f9486edd
Update map-render.cpp
Remove tabs
2018-12-06 15:21:19 +02:00
PatrikLundell ef57295c02 Added coal search to embark-assistant 2018-12-04 14:58:10 +01:00
PatrikLundell 0916d69373 Added coal search to embark-assistant 2018-12-04 14:57:44 +01:00
PatrikLundell 8f9cbfeafd Added coal search to embark-assistant 2018-12-04 14:57:23 +01:00
PatrikLundell 1ef7f0746c Added coal search to embark-assistant 2018-12-04 14:56:55 +01:00
PatrikLundell efeb0504cc Added coal search to embark-assistant 2018-12-04 14:55:59 +01:00
PatrikLundell 5f6376e76e Added coal search to embark-assistant 2018-12-04 14:55:16 +01:00
JapaMala 435e44d99b Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader 2018-12-02 08:57:15 -06:00
lethosor b913076451 Update xml, stonesense, changelog
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
lethosor 368f8d0504 Remove and replace checks for OnBreak 2018-11-24 14:52:26 -05:00
Japa Mala Illo 67ce858772 Changed some debug stuff to use new variable names from the xmls 2018-11-11 16:21:15 -06:00
Japa Mala Illo 6aea842f1b Added tree info data to protos, not used yet. 2018-10-28 10:45:32 -05:00
Japa Mala Illo 85a4fef1d8 Added unknowns to saved tree export. 2018-10-28 10:22:55 -05:00
Japa Mala Illo d677880131 Fix issues with missing onbreak flag 2018-10-28 10:22:03 -05:00
Japa Mala Illo 836c011b33 Changed the plant tiles to more descriptive names. 2018-10-28 09:33:26 -05:00
Japa Mala Illo 7b6b83bdcf added a command to dump all trees in the map for debug. 2018-10-28 02:01:01 -05:00
Warmist ff452f9181 Add more comments 2018-10-12 13:37:49 +03:00
Warmist 5c1b7030e7 Also rename the plugin lua file 2018-10-12 10:44:56 +03:00
Warmist d9d470e4b6 Missing REQUIRE_GLOBAL(init) 2018-10-12 10:41:43 +03:00
Warmist f74ee143dd Might as well use REQUIRE_GLOBAL 2018-10-12 10:40:44 +03:00
Warmist cb9c964722 Rename twbt-utils to map-render 2018-10-12 10:40:20 +03:00
Warmist 41856aef37 Merge remote-tracking branch 'origin_DFHACK/develop' into twbt_experiments 2018-10-12 10:31:37 +03:00
Kelly Kinkade 3351d78864 Change embark-assistant to biome type from Maps
See #1392
2018-09-11 18:27:44 -05:00
billw2012 fefef2e121 Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged. 2018-08-31 20:53:06 +01:00
Ben Lubar 4e690df96a
Add Persistence module.
Alter World to use Persistence instead of storing data in historical figures.

Fake historical figures will be converted to the new format when a world is loaded.

Added plugin_save and plugin_load functions to the plugin API.

Made the weird int7/int28 code that was in the old persistence API slightly safer.
2018-08-26 18:27:58 -05:00
Kelly Kinkade 98903d9d71 [tailor] tidy 2018-08-26 09:30:08 -05:00
billw2012 239d4a8c46 Attempt to full exclude disabled labors from all relevant calculations. 2018-08-26 13:38:03 +01:00
Kelly Kinkade d3b335105c Add "tailor" plugin, to provide clothing management 2018-08-25 12:02:28 -05:00
Japa Mala Illo 1d8e55ea9b Merge remote-tracking branch 'DFHack/develop' into remote_reader 2018-08-24 12:15:13 +05:30
PatrikLundell 73e7ffff83 Made cancel state sensitive 2018-08-18 18:03:00 +02:00
PatrikLundell 2ed6469be8 Made cancel state sensitive 2018-08-18 18:02:19 +02:00
Kelly Kinkade 6275905644 nestboxes: Use buildings.others[NEST_BOX]
Should minimize performance impact (not that it was much before)
2018-08-16 11:33:59 -05:00
Kelly Kinkade 784c3b1590 a pox on invisible whitespace 2018-08-16 10:32:50 -05:00
Kelly Kinkade 750b3cb885 the tabmonster strikes again 2018-08-16 10:30:53 -05:00
Kelly Kinkade c840321edf move nestboxes out of devel 2018-08-16 10:23:15 -05:00
Kelly Kinkade a404ab3096 nestboxes: clean up & update description 2018-08-16 10:21:44 -05:00
billw2012 76b8f4af0e Fixing tab 2018-08-10 21:25:40 +01:00
billw2012 039fb3bc6b labormanager: add option to disable the management of a labor.
Also switching to case insensitive labor name matching.
2018-08-10 20:42:34 +01:00
Kelly Kinkade 19a575df3a labormanager: assign more dwarves to cleaning
I am fairly certain that Toady changed how cleaning jobs are spawned; this makes it so that cleaning actually happens with labormanager.
2018-08-09 06:18:01 -05:00
PatrikLundell c75a4fe8ee Used taleden's world map size algorithm 2018-08-06 11:52:22 +02:00
JapaMala 4b8cf7f65e Added armor raw info. 2018-08-05 21:29:40 +05:30
PatrikLundell aa6182a1ee Added embark-assistant world match indication 2018-08-05 17:28:49 +02:00
PatrikLundell 136eb0f03a Added embark-assistant world match indication 2018-08-05 17:23:03 +02:00
PatrikLundell f7fadaab37 Added embark-assistant world match indication 2018-08-05 17:11:47 +02:00
PatrikLundell 4c850cabca Added embark-assistant world match indication 2018-08-05 17:11:39 +02:00
PatrikLundell 70630cfd92 Added embark-assistant world match indication 2018-08-05 17:11:26 +02:00
lethosor d26b1759a2 Merge remote-tracking branches 'ab9rf/labormanager-1142', 'ab9rf/labormanager-1162' and 'ab9rf/labormanager-respect-nature' into develop 2018-08-04 00:52:59 -04:00
JapaMala f2664f7926 Add unit facing and sub-tile position when moving. 2018-08-03 23:18:02 +05:30
lethosor 1c137f9a35 Fix a few Lua 5.3-related errors
Reported on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7821831#msg7821831
2018-08-02 14:36:15 -04:00
JapaMala efe4926df0 Send equipped item bodypart attachments over RFR 2018-08-02 21:50:29 +05:30
Kelly Kinkade 214b0c4bc6 (labormanager) respect NATURE value
Units with values regarding NATURE will be preferenced or dispreferenced
for jobs which might give them a good/bad feeling because of that value
2018-07-31 19:12:07 -05:00
JapaMala 5e95bd9cf2 Merge remote-tracking branch 'dfhack/develop' into remote_reader 2018-07-31 19:46:31 +05:30
Kelly Kinkade a6067c20c1 (labormanager) only assign valid labors (fix #1142)
Add a number of tests to ensure that only assignable labors are assigned
to units, and that only units that are eligible to be assigned labors
are considered at all.

I borrowed logic from Dwarf Manipulator to identify units eligible to be
assigned labors.

This should prevent pets., ghosts, visitors, or any other noneligible
entities from being assigned labors by labormanager, and should thus fix
#1142.
2018-07-30 22:36:59 -05:00
Kelly Kinkade 99490aff41 add support for craft item from pearl jobs (fixes #1162) 2018-07-30 21:32:15 -05:00
JapaMala 0a0cbdf2de Add creature flags to RFR creature raws. 2018-07-28 18:39:45 +05:30
lethosor d9fb364b3f Fix prospector out-of-bounds crash and improve checking
Fixes #1370
2018-07-21 00:27:11 -04:00
lethosor 61df5e5286 Merge remote-tracking branch 'KlonZK/patch-1' into develop 2018-07-20 23:16:28 -04:00
lethosor 09ec8910ca Avoid clearing CMAKE_CXX_FLAGS for plugins 2018-07-19 15:32:08 -04:00
lethosor af53fe6740 embark-assistant: fix x=16, y=16 dimensions 2018-07-19 14:48:28 -04:00
Ben Lubar 3e82bd8f35
Ignore CMakeLists.custom.txt and create it if it does not exist during cmake. 2018-07-18 14:00:40 -05:00
KlonZK 29f6131e26
fix custom animation tables
move "local frames" from inside the block to outside.
2018-07-16 10:39:05 +02:00
PatrikLundell baef5ca319 Added Finder scrolling and Frozen search 2018-07-13 20:44:11 +02:00
PatrikLundell 1af0ec4006 Added Finder scrolling and Frozen search 2018-07-13 20:43:49 +02:00
PatrikLundell 3d5cadeb8c Merge branch 'embark-assistant' of https://github.com/PatrikLundell/dfhack into embark-assistant 2018-07-13 17:53:34 +02:00
PatrikLundell 4137a17a78 Added Finder scrolling and Frozen search 2018-07-13 17:43:46 +02:00
PatrikLundell 658fac0b93 Added Finder scrolling and Frozen search 2018-07-13 17:43:22 +02:00
Lethosor 3e47de5b45
Merge branch 'develop' into embark-assistant 2018-07-13 11:33:57 -04:00
PatrikLundell fdf52deb36 Added Finder scrolling and Frozen search 2018-07-13 17:23:34 +02:00
PatrikLundell 02dd97722c Added Finder scrolling and Frozen search 2018-07-13 17:23:12 +02:00
PatrikLundell 4d3f9ce13d Added Finder scrolling and Frozen search 2018-07-13 17:22:49 +02:00
PatrikLundell 539428b741 Added Finder scrolling and Frozen search 2018-07-13 17:22:26 +02:00
PatrikLundell f41715309a Added Finder scrolling and Frozen search 2018-07-13 17:21:42 +02:00
lethosor c82532fd4b Merge remote-tracking branch 'suokko/ruby_memory_return_calling_convention' into develop 2018-07-12 14:53:20 -04:00
lethosor 7afa3690bf Add support for DFHACK_BUILD_ID
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
lethosor 06511340ab Merge remote-tracking branch 'BenLubar/proto-docs' into develop 2018-07-10 11:26:31 -04:00
lethosor 21b9e828d3 embark-assistant: add spaces around keys
Further spacing work is tedious without rewriting it to use DFHack::Screen or
uicommon.h as every coordinate needs to be adjusted by hand
2018-07-10 11:22:12 -04:00
lethosor eb1f3e1d4c embark-assistant: add spaces around drawBorder titles 2018-07-10 11:01:22 -04:00
lethosor 8dec8c332f embark-assistant: use STANDARDSCROLL keys instead of CURSOR keys for scrolling 2018-07-10 10:59:52 -04:00
lethosor 2dac3c53c7 Add stress cutoffs to Units module, fix dwarfmonitor/manipulator
Fixes #1292
2018-07-09 15:59:12 -04:00
lethosor 46e53fc3b3 Make df2console only call df2utf if the output stream is a console
Fixes output in command-prompt, for example
2018-07-09 11:00:28 -04:00
JapaMala 4b64d2dec6 Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader
# Conflicts:
#	docs/changelog.txt
2018-07-08 19:23:56 +05:30
lethosor 10abbf8ac2 Update docs for dfhack/stonesense#57 2018-07-08 00:19:58 -04:00
lethosor 00fa70dae9 Bump to beta2.1 (stonesense fix) 2018-07-07 21:42:01 -04:00
lethosor d2d1501dfd Merge remote-tracking branch 'suokko/workflow_crafts_advanced' into develop 2018-07-07 19:43:16 -04:00
lethosor 037e7e4901 Merge remote-tracking branch 'suokko/spotclean_ui_state_fix_1194' into develop
Moved/adjusted changelog entry
2018-07-07 18:08:53 -04:00
lethosor 3bec52b2a7 embark-assistant: some cleanup 2018-07-06 15:16:45 -04:00
Pauli ff6d0c4e7d Fix memory return calling convention in ruby bindings
Calling convention for memory return is that caller allocates (in stack)
memory to hold returned object. Then caller passes the pointer to callee
as implicit first parameter.

references:
https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
https://msdn.microsoft.com/en-us/library/7572ztz4.aspx

Fixes #1209
2018-07-04 23:46:23 +03:00
Pauli 57dd9e944e Fix crafts advanced constraints in workflow
Fixes #1247
2018-07-04 19:10:51 +03:00
Pauli d1a3f1a738 Allow canceling lineedit with ctrl+c 2018-07-04 15:21:25 +03:00
Pauli 490a855776 Add a test for signal_shared_tag implementation
The test cases check that the signal_shared_tag implementation can be
used and destructed safely from multiple threads.
2018-07-04 15:18:20 +03:00
Pauli 9cfb07f476 Add debug plugin to manage runtime debug filters 2018-07-04 15:18:20 +03:00
Ben Lubar 5db34339a5
Fix typo 2018-07-03 18:17:04 -05:00
Ben Lubar 4a0682133e
Annotate plugin proto files with the name of the plugin they are associated with. 2018-07-03 15:54:30 -05:00
Ben Lubar df9150f302
Add documentation for RPC functions supported by RemoteFortressReader and ISOWorldRemote. 2018-07-03 15:37:16 -05:00
Ben Lubar 6839fde555
Remove execute permission on files that are not executables. 2018-07-03 15:37:16 -05:00
lethosor 616675f0ce Merge remote-tracking branch 'suokko/kittens_data_race_fix' into develop 2018-07-03 00:30:36 -04:00
lethosor 81a7ddcf92 Merge remote-tracking branch 'suokko/screen_show_memory_leak' into develop 2018-07-02 22:58:11 -04:00
lethosor 7e91173289 Merge remote-tracking branch 'origin/develop-cf-autofix' into develop 2018-07-02 13:44:20 -04:00
JapaMala 7fd23d46f0 Send the building preview over RFR 2018-07-02 22:04:47 +05:30
lethosor f0ff96f614 Merge remote-tracking branch 'suokko/multibyte_console' into develop 2018-07-02 10:55:03 -04:00
JapaMala c489147657 Enabled building buildings through RFR 2018-07-02 00:37:02 +05:30
codefactor-io a08f08ae5f [CodeFactor] Apply fixes 2018-07-01 15:25:53 +00:00
JapaMala d9b910f79c Made a function to find building extents for un-built buildings. 2018-07-01 20:36:36 +05:30
JapaMala 9c2e052d4d More detail in build menu 2018-07-01 14:00:05 +05:30
Pauli 645ec0d591 Improve kittens thread safety and shutdown with core
The bools could use acquire&release memory order or even relaxed but I
didn't think code was worth auditing for such low level optimizations.
Sequantial consistent is fast enough but much harder to use incorrectly.

The timeLast is protected by CoreSuspender lock. plugin_update is only
called when CoreSuspender lock is held.

The last_menu is protected by trackmenu_flg loads and stores.
2018-06-30 21:53:12 +03:00
Pauli 0727403ac1 Fix devel plugins linking in linux 2018-06-30 21:12:42 +03:00
lethosor 105ddd86d8 Merge remote-tracking branch 'suokko/jsoncpp_upgrade_to_submodule' into develop 2018-06-29 22:33:00 -04:00
JapaMala 44f461711c Respond to building selection commands. 2018-06-29 21:59:48 +05:30
JapaMala 897b7b6a47 Send the building menu items over RFR 2018-06-28 20:27:12 +05:30
Pauli afd942a94b ruby: Support automatic array size from index-enum 2018-06-26 23:48:54 +03:00
JapaMala 4970935b9a fixed sidebar mode numbering. 2018-06-24 16:19:52 +05:30
JapaMala 93c3418f97 Added a simple function to get the current sidebar mode in fort mode. 2018-06-24 14:45:57 +05:30
Pauli 1fc37f8ddc Checke Console::lineedit error return values
Console::lineedit can return -1 to indicate input error and -2 to
indicate the program is closing. But most users don't check possible
unusual return values which can lead to exit hang.
2018-06-22 17:57:37 +03:00
lethosor 9c7bd562d4 fix-unit-occupancy, autogems: stop running while embarking
Related to #1286 fix
2018-06-21 16:16:54 -04:00
lethosor 46e31305a1 Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2018-06-21 15:54:03 -04:00
lethosor f20dae5a4c Merge remote-tracking branch 'suokko/fix_dramp_to_check_jobs_1228' into develop 2018-06-21 15:20:41 -04:00
PatrikLundell 8e1a1851be Removed temporary comments 2018-06-21 21:00:59 +02:00
PatrikLundell 9a8e251853 Updated evil weather 2018-06-21 20:51:36 +02:00
PatrikLundell f02f4b8bcc Updated evil weather 2018-06-21 20:51:05 +02:00
PatrikLundell 91aa16216b Updated evil weather 2018-06-21 20:50:30 +02:00
PatrikLundell 1382c04696 Updated evil weather 2018-06-21 20:49:49 +02:00
PatrikLundell 14b0ea5b98 Updated evil weather 2018-06-21 20:49:08 +02:00
PatrikLundell ad5328e119 Updated evil weather 2018-06-21 20:48:35 +02:00
lethosor 42eadf97b0 Update stonesense (#1302, dfhack/df-structures#247) 2018-06-21 12:00:12 -04:00
lethosor d9917e9a1d cxxrandom: remove pragmas, fix format warnings, misc. cleanup 2018-06-21 12:00:04 -04:00
lethosor 7a5e7c7c86 Rename unit_flags1.dead to killed, update submodules/changelog
Follow-up for dfhack/df-structures#247
2018-06-21 11:17:09 -04:00
lethosor 46b6bfd3f7 Merge remote-tracking branch 'suokko/fix_stocks_to_filter_military_items_1288' into develop 2018-06-21 00:04:06 -04:00
lethosor b2fd0b062b Merge remote-tracking branch 'PatrikLundell/dead_plugins' into develop 2018-06-20 16:18:07 -04:00
Pauli 72029e7de9 Avoid closing DF if launching command-prompt from prompt 2018-06-20 22:16:23 +03:00
Pauli 9b6781f0f2 Temporary lower command-prompt when executing the command
command-prompt viewscreen may affect command execution if they are
looking for UI state. To make commands execute simillary to hotkeys or
console commands the viewscreen needs to removed from the top position.

Fixes #1194
2018-06-20 21:51:45 +03:00
lethosor cdca28ddfa Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-06-20 12:10:52 -04:00
lethosor 7036cc376b Fix warnings in devel plugins introduced by #1302 2018-06-20 12:03:14 -04:00
lethosor 6077a8ce4c Merge remote-tracking branch 'suokko/printf_warnings' into develop 2018-06-20 11:25:14 -04:00
lethosor 862fa08ba6 Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop 2018-06-20 11:00:43 -04:00
Pauli f90eebdd2d Add designation job check to deramp
Fixes #1228
2018-06-20 15:54:31 +03:00
Pauli bd0d36ec82 Fix stockpile inventory not to include inventory items
Inventory items have stale position information. The coordinates can be
very old if item is owned and continuesly carried for long time. The fix
checks if item is carried. To avoid filtering carried items that are
assigned (containers) to the stockpile the assignment needs to be
checked.

Fixes #1288
2018-06-19 18:06:28 +03:00
Pauli 9c59b7ff48 Fix unlikely memory leaks if Screen::show fails
The Screen::show takes ownership of the screen pointer. I decided to
switch the parameter to std::unique_ptr to make the pointer ownership
explicit. The unique_ptr then provides automatic screen destruction in
Screen::show unless pointer is inserted or is already in the linked list
that is managed by df.
2018-06-19 16:41:31 +03:00
JapaMala dc367f212e Move fortress mode control stuff into a different file. 2018-06-18 22:12:52 +05:30
JapaMala 6ef85908ac Bump df version 2018-06-18 21:28:56 +05:30
Pauli 6f7ace1f6d stockpiles: Fix unusable and usable loading for weapon and armor
Fixes #1294
2018-06-14 22:22:51 +03:00
Pauli 2b79b4cce7 Use jsoncpp 1.8.4 as a submodule
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.

jsoncpp library name changes to jsoncpp_lib_static.

jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
lethosor aac892c560 Adapted to changed Units functions
Squashed version of #1307

Closes #1307
2018-06-14 10:30:35 -04:00
PatrikLundell cf780ce035 dead flag -> !isActive 2018-06-14 12:35:17 +02:00
PatrikLundell cac749429a dead flag -> !isActive 2018-06-14 12:34:41 +02:00
PatrikLundell 3be27a49b5 dead flag -> !isInactive 2018-06-14 12:33:18 +02:00
PatrikLundell f076d00ede dead flag -> !isActive 2018-06-14 12:32:38 +02:00
PatrikLundell b38dfe2e43 dead flag -> !isActive 2018-06-14 12:31:52 +02:00
PatrikLundell da0aa85b05 dead flag -> !isActive 2018-06-14 12:31:15 +02:00
PatrikLundell aa361f3a0d dead flag -> !isActive 2018-06-14 12:30:41 +02:00
PatrikLundell 6901c53bd5 dead flag -> !isActive 2018-06-14 12:29:48 +02:00
PatrikLundell 897a818f4c Switch to Units functions 2018-06-14 09:42:45 +02:00
lethosor 39194e5e38 Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11) 2018-06-13 16:08:41 -04:00
lethosor cddb1b59e1 title-version: move to bottom of options screen
This avoids overlapping the window border when a world is loaded
2018-06-13 15:57:13 -04:00
lethosor de0521e618 title-version: add to options screen 2018-06-12 16:38:53 -04:00
lethosor 40d0d946a4 autogems: avoid crash with non-workshop links, add some logging
Also update changelog, including revflood change

Fixes #1303
2018-06-12 12:17:04 -04:00
Pauli 8f2cf3ad26 Fix printf format warnings 2018-06-11 19:57:06 +03:00
Pauli 01abcb756e Request c++14 support from compilers
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
2018-06-10 23:15:33 +03:00
Quietust 8717144f14 Fix revflood bug, was revealing some tiles from below inappropriately
When scanning floor tiles from below, don't just leave them hidden, but
skip checking neighbors as well
2018-06-09 14:19:52 -06:00
lethosor 7e57450e78 Change buildingplan quality adjustment keys per #1284 comment, for consistency 2018-06-08 22:25:56 -04:00
lethosor c4692b1c8d Merge remote-tracking branch 'TotallyGatsby/buildingplanmax' into develop 2018-06-08 22:07:54 -04:00
PatrikLundell 0ec3df6022 dead/killed flags 2018-06-08 11:09:11 +02:00
PatrikLundell 654f798b83 dead/killed flags 2018-06-08 11:08:35 +02:00
lethosor 03968db344 Fix GCC warnings in 'tweak kitchen-prefs-all' and dev plugins 2018-06-01 10:02:38 -04:00
lethosor f57327e7c8 Fix periodic events in several plugins
Also stop running buildingplan/fortplan while loading a world, and stop running
autogems while paused

Fixes #1286
2018-05-29 23:24:02 -04:00
Vitaly Pronkin 06b9dc0c1c remove trailing spaces 2018-05-25 12:43:30 +12:00
Vitaly Pronkin a44f5b57cb don't need this 2018-05-25 01:34:57 +12:00
Vitaly Pronkin 0217916568 mousequery plugin with TWBT modifications 2018-05-25 01:07:12 +12:00
lethosor e206a6d88b mousequery: leave menus safely, without looping
Fixes #1285
2018-05-22 16:37:44 -04:00
lethosor 5f81cac3b7 dwarfmonitor.lua: use dmerror() consistently 2018-05-21 21:23:52 -04:00
Phillip Spiess 3e54a136fd Use two keys for min/max 2018-05-20 20:50:42 -07:00
Phillip Spiess 385ac3f9f5 Add 'Max Quality' setting to buildingplan 2018-05-20 14:36:50 -07:00