Commit Graph

3704 Commits (860131cf963c89d10101e232d8b161647ff060ba)

Author SHA1 Message Date
Alan e8fcc8d5c0
Merge pull request #1460 from JapaMala/remote_reader
Smal RFR change
2019-10-04 01:16:05 -04:00
lethosor f3658db85f Merge branch 'develop' into avoid_rebuilding_df_statics_if_core_h_changes 2019-10-03 23:23:36 -04:00
PatrikLundell 7979150566 Removed trailing blank 2019-09-24 11:14:50 +02:00
PatrikLundell 5eceab2794 Added 'fileresult' optional parameter, improved world traversal 2019-09-23 13:13:04 +02:00
JapaMala f00a7f9b39 Bump RFR Version number. 2019-09-08 15:33:39 -05:00
JapaMala 099ae66be8 Merge branch 'develop' into remote_reader 2019-09-08 15:30:14 -05:00
Warmist 0a42fe0e38 Delete trailing whitespace 2019-09-02 19:50:00 +03:00
Warmist 62aff6edee Whitespace fix 2019-09-02 18:40:50 +03:00
Warmist df756f22f8 Change dwarfmonitor to use global lua state.
This needs more CoreSuspends but they are needed either way. This way
you can access other script environments and access this plugin enviroment
from lua.
2019-09-02 18:35:46 +03:00
lethosor 7a5902418e Abbreviate label on narrow screens 2019-08-25 21:49:41 -04:00
lethosor 417212814d embark-assistant: add in-game key to activate
Closes #1384
2019-08-25 21:33:43 -04:00
lethosor ac5a54c8db Merge branch 'develop' into cmake-cleanup
Conflicts:
	library/CMakeLists.txt
	plugins/CMakeLists.txt
2019-08-23 23:58:00 -04:00
lethosor 07575095fd Merge branch 'develop' into persist 2019-08-22 22:00:50 -04:00
lethosor 0b8eba7d23 Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
Conflicts:
	docs/changelog.txt
2019-08-22 21:50:54 -04:00
japamala d17820a596 Made RemoteFortressReader pulll from the active units list, not from the full units list. 2019-08-22 19:26:19 -06:00
Alan 2344e60101
Merge pull request #1181 from warmist/twbt_experiments
map-render plugin
2019-08-21 09:33:45 -04:00
JapaMala a07b568597 Changed the serialization to use the actual enum item names instead of converting them to numbers. 2019-08-13 17:15:06 -05:00
JapaMala 47b43e6dd7 Merge branch 'develop' into auto_clothing 2019-08-06 20:12:26 -05:00
JapaMala e1661d8404 Merge remote-tracking branch 'remotes/dfhack/develop' into auto_clothing 2019-08-06 20:07:20 -05:00
lethosor 88757d5c27 Merge branch 'develop' into cmake-cleanup 2019-07-20 19:22:33 -04:00
lethosor e86e20717e Merge remote-tracking branch 'JapaMala/remote_reader' into develop 2019-07-20 19:05:32 -04:00
lethosor 99038c395a Merge remote-tracking branch 'ab9rf/biometype' into develop 2019-07-20 16:32:46 -04:00
lethosor ab9ad6f93e Clean up *.cmake style 2019-07-20 16:17:44 -04:00
lethosor 76da2c2aaf Clean up CMakeLists.txt style 2019-07-16 22:19:11 -04:00
lethosor f7f937e4d3 Merge remote-tracking branch 'janxious/patch-2' into develop
Closes #1441
2019-07-15 23:22:43 -04:00
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