Commit Graph

11296 Commits (1f3c4cdd18d9d7f67476d3104ded092161dd92aa)
 

Author SHA1 Message Date
Ben Lubar dfc90fe660
Update df-structures and scripts. 2020-02-02 17:10:11 -06:00
Ben Lubar ceaa457460
point the git module at the DFHack fork of the jsoncpp repository for consistency 2020-01-31 13:43:57 -06:00
Ben Lubar 62e3802d26
Update to DF 0.47.01 2020-01-29 14:51:48 -06:00
PatrikLundell 121497a466 Propagated getBookTitle to Lua 2020-01-26 11:47:47 +01:00
PatrikLundell 876ac6c056 Renamed to getBookTitle, cut down on virtual_cast 2020-01-25 21:46:10 +01:00
PatrikLundell c6bbf39c6c Issue #1262. Added Items::getTitle and used in stocks 2020-01-25 12:43:02 +01:00
PatrikLundell 04550499b6 Updated getplants documentation 2020-01-22 19:41:06 +01:00
PatrikLundell 9d4d0b195a Added switches for farm seeds and plant counts 2020-01-22 17:33:39 +01:00
lethosor 82f082d7cb Fix authors ordering 2020-01-19 00:15:06 -05:00
lethosor 163971ec56 Bump version to 0.44.12-r3 2020-01-19 00:05:43 -05:00
lethosor 63daacd968 Update changelog (dfhack) 2020-01-19 00:04:40 -05:00
lethosor bb9a7e713e Update changelog and authors (scripts, df-structures) 2020-01-18 23:20:29 -05:00
lethosor f77114bd90 Update scripts for 0.44.12-r3 release 2020-01-18 22:34:57 -05:00
lethosor bcd7974561 Merge branch 'develop' of gh:DFHack/dfhack into develop 2020-01-18 22:31:33 -05:00
Alan 92aa14aa8a
Merge pull request #1447 from lethosor/cmake-cleanup
CMake cleanup
2020-01-18 22:31:05 -05:00
lethosor 815821eb93 Merge branch 'develop' into cmake-cleanup
Conflicts:
	depends/lua/CMakeLists.txt
	plugins/CMakeLists.txt
	plugins/devel/CMakeLists.txt
2020-01-18 22:28:43 -05:00
lethosor d4d083d8cf autofarm: fix GCC warnings 2020-01-18 20:53:13 -05:00
lethosor bb9bc4e353 Update submodules 2020-01-18 18:52:32 -05:00
lethosor f55a1b9990 autofarm: mention runonce and status in built-in help 2020-01-18 18:52:17 -05:00
lethosor f070ac246e Fix link text for "disable" command references in docs 2020-01-18 18:51:54 -05:00
lethosor 7554b30727 Call out infiniteSky docs warning 2020-01-18 18:49:54 -05:00
lethosor afd5d0b184 Add autofarm docs 2020-01-18 18:49:15 -05:00
lethosor dc8b8b501b Move autofarm to supported plugins
PR #1468
2020-01-18 17:17:28 -05:00
lethosor 3e47ba543b Merge remote-tracking branch 'ab9rf/autofarm-cpp' into develop
Ref #1468
2020-01-18 17:11:43 -05:00
lethosor 513b7e02a6 Add new verbose option to getplants docs
From #1481
2020-01-18 16:38:19 -05:00
lethosor e5a5e39c3a Move getplants issue details to user-facing docs
Ref #1479, #1481
2020-01-18 16:34:29 -05:00
lethosor 72fd32cb2a Tweak spelling/wording/style 2020-01-18 16:22:21 -05:00
lethosor af1668126d Merge remote-tracking branch 'PatrikLundell/getplants' into develop 2020-01-18 16:19:40 -05:00
Alan 1cd78a2de4
Merge pull request #1482 from BenLubar/title-folder-text
Don't print an error about not being able to get the SDL title in text mode.
2020-01-16 10:19:46 -05:00
PatrikLundell eeacbc80c6 Explicit type conversion with %d warning silencing 2020-01-16 13:59:31 +01:00
PatrikLundell ee2259bbca Replaced poor auto with actual type 2020-01-16 12:57:09 +01:00
Ben Lubar cbf5c5459a
Don't print an error about not being able to get the SDL title in text mode. 2020-01-15 16:07:41 -06:00
PatrikLundell cd4b00e23e Merge branch 'getplants' of https://github.com/PatrikLundell/dfhack into getplants 2020-01-15 21:30:56 +01:00
PatrikLundell 8cebb6cef5 removed trailing whitespace 2020-01-15 21:29:01 +01:00
PatrikLundell 7797f9979b
Merge branch 'develop' into getplants 2020-01-15 20:00:49 +01:00
PatrikLundell 8c049389a4 Reverted STOCKPILE_PLANT_GROWTH to LEAF_MAT 2020-01-15 19:31:19 +01:00
PatrikLundell 15e06640f6 Partial correction of issue 1479 and added verbose flag 2020-01-15 12:40:43 +01:00
lethosor 045d8bfd1e Linux launcher: attempt to fall back to a working architecture for setarch
Also include directions if this fails

Closes #1466
2020-01-14 23:56:25 -05:00
lethosor 4feb0aa21f Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2020-01-14 23:41:22 -05:00
Ben Lubar 96d8dffd32
Make dfhack.run_command return the command_result value.
Rename local variables to match dfhack.run_command_silent for clarity.
2020-01-14 17:53:52 -06:00
lethosor 47fa9e1159 Update authors, submodules 2020-01-13 23:35:31 -05:00
lethosor 5eca50476e Merge remote-tracking branch 'nornagon/unit-description' into develop 2020-01-13 23:31:23 -05:00
Ben Lubar be5dc2d4a4
Make Units::isGay act consistently when called on an asexual unit.
The function appears to be used to determine whether heterosexual relationships are possible, so asexual units will always return true for isGay.

Old behavior was to treat asexual units as male.
2020-01-09 14:48:30 -06:00
Jeremy Apthorp 5de368a1ed unit_{=> get_}physical_description 2020-01-04 22:17:03 +11:00
Jeremy Apthorp 7644dde9e4
default to empty description if symbol unavailable 2019-12-14 12:01:13 -08:00
Jeremy Apthorp 50e696acf6 getDescription => getPhysicalDescription 2019-12-14 09:36:47 -08:00
Jeremy Apthorp 7fce6fe0b0 move THISCALL define to header, clean up code a little 2019-12-13 23:54:27 -08:00
Jeremy Apthorp dfab521a71
specify __thiscall
According to https://docs.microsoft.com/en-us/cpp/cpp/thiscall?view=vs-2019, "on ARM and x64 machines, __thiscall is accepted and ignored by the compiler.". So it should be OK to specify this for all win32
2019-12-12 17:51:41 -08:00
Jeremy Apthorp 9a37849603 use symbols.xml 2019-12-07 22:41:55 -08:00
Jeremy Apthorp 910f965838 wip 2019-12-07 22:17:59 -08:00