Commit Graph

2122 Commits (5c0588dd34f51d104ef654f952147c2f3a2f4d77)

Author SHA1 Message Date
Eric Wald 1b1475fb94 Warning about mismatched stockflow entries.
For the most part, mismatches should only happen if the reaction list has changed between world loads, which means either the raw files or the plugin files have been changed.  For now, such entries are ignored, though in some cases it might be possible to recover a new order number by searching through the reaction list.
2014-08-03 15:04:28 -06:00
Eric Wald 2db1c9d722 Moving the global job_types cache into the two functions that use it.
It's mostly an artifact of a misunderstanding, anyway.
2014-08-03 14:57:20 -06:00
Eric Wald 1aafa206bc Localizing a few Lua variables.
It seems like the globals could be localized, too, but I'm not quite sure what that would accomplish.
2014-08-02 18:08:13 -06:00
Eric Wald ad4d545036 Ignoring the removed job types for DF 0.40+
The version check allows the plugin to work with DF 0.34, just in case.
2014-08-02 17:58:36 -06:00
Quietust 2928f15629 Update fastdwarf to work properly in 0.40 2014-08-01 08:45:23 -05:00
Quietust 1450298484 assumed_identity -> identity 2014-07-29 16:30:22 -05:00
Quietust 88dfb1faef criminal_case -> crime 2014-07-29 16:27:16 -05:00
Quietust d6162cd189 death_info -> incident 2014-07-29 16:26:14 -05:00
JapaMala bc5e0f6ad6 Made DFHack buildable. Also added plant proto definitions 2014-07-23 19:57:47 +05:30
Quietust e711605413 Some minor corrections 2014-07-21 13:26:34 -05:00
Quietust 97de21357c First pass for 0.40 compatibility; still lots left to do, but this will at least build 2014-07-21 13:18:29 -05:00
JapaMala b598cbb0dd Merge branch 'develop' of github.com:DFHack/dfhack into develop 2014-07-20 16:43:00 +05:30
JapaMala 216019e5af Disconnected the RemoteReader values from the DF enums. 2014-07-17 17:46:00 +05:30
JapaMala 48e714b65b Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader 2014-07-15 17:50:11 +05:30
JapaMala 2d5ec9e45d remotefortressreader can send over more info over the sockets. 2014-07-15 17:48:12 +05:30
expwnent 0a16bc2e12 Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
Conflicts:
	plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
expwnent 6652074644 Delete the syndromeTrigger plugin. 2014-07-03 09:03:26 -04:00
expwnent 81c87d0921 EventManager: INTERACTION event for unit interactions. 2014-07-03 04:55:12 -04:00
JapaMala 829ad945ea Added a function to do a hash check on the entire fortress. It's not overly useful yet, other than benching. 2014-07-03 08:35:45 +05:30
JapaMala e04ab11659 Merge branch 'develop' of github.com:DFHack/dfhack into develop
Conflicts:
	library/xml
	plugins/stonesense
2014-07-02 23:18:55 +05:30
expwnent d765de4546 Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization 2014-07-01 02:05:14 -04:00
expwnent fe875f7c02 Cleaned up eventful.lua.eventType. 2014-06-30 03:16:45 -04:00
expwnent c7636ae442 Deleted devel/printArgs because there's a script for that. 2014-06-30 02:56:07 -04:00
expwnent 2894b406ac Sorted devel CMakeList. 2014-06-30 02:54:15 -04:00
expwnent deb755fd57 Sorted the plugins CMakeList. 2014-06-30 02:51:23 -04:00
expwnent 0aa2dc149f Converted outsideOnly plugin to Lua script. 2014-06-30 02:21:58 -04:00
expwnent 961d033ade EventManager: unload event for convenience. 2014-06-29 10:03:55 -04:00
expwnent f88c176dd3 Removed autoSyndrome. 2014-06-29 06:16:52 -04:00
warmist 5e2653998c Added rendermax to supported
It's stable enough and quite nice. Also one person missed it in release.
2014-06-28 16:18:04 +04:00
expwnent 8e7e87ac73 Added UNIT_ATTACK event to EventManager and exposed it to Lua. 2014-06-28 02:31:34 -04:00
Quietust fc7ac9b47f Update XML and sync plugin 2014-06-27 13:01:46 -05:00
Alexander Gavrilov 92c4514286 Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop 2014-06-26 17:22:56 +04:00
JapaMala 4f9479cce5 Fixed a bug where remotefortressreader was using min_x for min_z. 2014-06-25 18:49:00 +05:30
lethosor 3c8ba091f2 Disable "stable position" when site finder is active 2014-06-24 10:08:50 -04:00
Quietust 9625d56384 Update Manipulator to respect entity permitted_labor settings
This has the effect of locking out the Alchemy labor, which is how it's
supposed to work in-game (but doesn't due to bug #6511)
2014-06-24 08:36:36 -05:00
expwnent 7313c18a2a EventManager/eventful: added ON_REPORT event and exposed it to Lua. 2014-06-23 09:15:46 -04:00
expwnent 9afc861a2a syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly. 2014-06-23 09:14:56 -04:00
expwnent 247bd212f3 Update stonesense. 2014-06-21 13:28:59 -04:00
JapaMala 3f717af0b7 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
Conflicts:
	library/xml
2014-06-21 16:43:44 +05:30
expwnent f94fc5846d outsideOnly: allow checking periodically in case a building was made outside and then became inside. 2014-06-20 19:48:56 -04:00
expwnent c0e6e62cea outsideOnly: registration of buildings is now required, and you can also register buildings as inside-only. 2014-06-20 18:49:11 -04:00
expwnent 12d18ca64d Fix compile issues on windows. 2014-06-19 22:32:02 -04:00
expwnent 3357718d03 Merge remote-tracking branch 'origin/develop' into 0.34.11-r5
Conflicts:
	Readme.rst
	plugins/CMakeLists.txt
2014-06-19 19:59:20 -04:00
lethosor cca605d8b4 Prevent blank lines from being stored in history 2014-06-17 17:21:30 -04:00
lethosor 0c144b821d Reimplement command-prompt history
Also add shift-left/right for back/forward one word
2014-06-17 17:11:45 -04:00
lethosor 1684eced8a Remove (broken) command history
This reverts commit cc07a373f3.
2014-06-17 12:45:57 -04:00
lethosor 6f74d60521 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:33:04 -04:00
lethosor b8e7c8a946 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:28:46 -04:00
JapaMala ce849312c7 remotefortressreader now can send over sets of MapBlocks 2014-06-17 21:47:16 +05:30
Alexander Gavrilov 2db73a407d Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop 2014-06-17 10:39:26 +04:00
Alexander Gavrilov 86131781da Merge branch 'dev-embarktools-pr' of git://github.com/lethosor/dfhack into develop 2014-06-16 14:03:28 +04:00
Alexander Gavrilov f9f865cb90 Fix a compile error and signed/unsigned mismatch warnings. 2014-06-16 14:02:48 +04:00
JapaMala db2d59ac77 Started work on a generic visualizer socket client plugin. Currently only sends over inorganic and creature materials, nothing else. 2014-06-15 10:10:12 +05:30
Pierre-David Bélanger a751df4219 Allow to toggle between Profession and Squad view instead of wasting screen space with a new column 2014-06-10 22:59:28 -04:00
lethosor 5999dc63da Use setupdwarfgame field names 2014-06-10 17:30:02 -04:00
lethosor f534c91fb8 Fix screen handling 2014-06-10 12:48:46 -04:00
lethosor 69c9353196 Merge branch 'develop' into tweak-confirm-embark 2014-06-10 12:43:03 -04:00
lethosor b11673e9b0 Use this instead of getCurViewscreen 2014-06-10 12:38:40 -04:00
lethosor 088eff05e5 Merge branch 'develop' into dev-embarktools-pr 2014-06-10 12:08:43 -04:00
Pierre-David Bélanger 044f958551 Squad column and squad info in Dwarf Manipulator (manipulator plugin) 2014-06-09 21:58:16 -04:00
lethosor cc07a373f3 Command-prompt history
Creates duplicate entries occasionally

Also disabled movies
2014-06-09 19:38:21 -04:00
lethosor aafcd6c43a Fix 4/6 behavior 2014-06-09 17:00:26 -04:00
lethosor 055afafedc command-prompt: Basic line editing
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -04:00
Quietust a1f9b1d1c4 Sync with structures change 2014-06-06 14:24:57 -05:00
Lethosor c29d61dca2 Use INTERPOSE_NEXT in key_conflict
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
lethosor 0a1d87c09f confirm-embark: Make esc work again 2014-06-04 23:18:19 -04:00
lethosor f29d1886ff tweak confirm-embark fixes
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
lethosor 6ec0fd6589 New tweak: confirm-embark
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
lethosor a7fd6c4783 Add embark-tools settings interface 2014-06-03 15:03:03 -04:00
Quietust 23acf276b4 Silence warning C4800 on Windows 2014-06-03 08:58:31 -05:00
Quietust 7de0b2dd39 Merge pull request #255 from quietust/develop
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
Anuradha Dissanayake df244aa7a4 Disable mouse query when linking levers.
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
Anuradha Dissanayake 4034df3560 Fix incorrect plugin name in version check 2014-06-03 12:59:55 +04:00
Alexander Gavrilov 63254df6dd Fix obvious issues in stockflow.
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
Alexander Gavrilov e7292379f7 Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop 2014-06-03 12:13:56 +04:00
Alexander Gavrilov 4831fb8a8c Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop 2014-06-03 12:11:31 +04:00
Alexander Gavrilov 89269f76fd Merge remote-tracking branch 'warmist/cmd-prompt' into develop 2014-06-03 12:10:06 +04:00
Warmist 99659e7e00 cmd-prompt needs to work on ANY screen. This fixes it. 2014-05-26 18:42:42 +03:00
Quietust e483e7439f Fix problems with NONE for item types and subtypes 2014-05-22 08:18:01 -05:00
lethosor 2d778be956 Fix embark sidebar updating 2014-05-20 15:51:26 -04:00
lethosor fcb62ac7dd sticky: Fix handling of rapid input 2014-05-19 17:43:30 -04:00
lethosor da31bab419 Display embark label on all 5 map pages 2014-05-19 16:33:17 -04:00
lethosor bb5f7b475d Add sticky (equivalent of tweak stable-cursor) 2014-05-19 16:11:42 -04:00
lethosor 02811c773c Fix crash with child screens (e.g. saving a macro) 2014-05-19 15:53:29 -04:00
lethosor 96b70a93bc Update readme 2014-05-18 21:21:17 -04:00
lethosor 6519ac1bf8 Add sand indicator and allow enabling/disabling all tools 2014-05-18 20:03:59 -04:00
lethosor 0f5802af9f Add embark-tools
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04:00
Ben Lubar d1aee89491 remove space before hyphen 2014-05-18 13:01:07 -05:00
Ben Lubar 76ec3ba58c Fix English names containing the word "the"
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
expwnent 8cc4bea0d4 Added petcapRemover plugin. 2014-05-17 17:59:41 -04:00
lethosor f852802270 Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins 2014-05-16 21:23:34 -04:00
lethosor 293a535aa4 Fix crash with mouse input in search plugin 2014-05-16 20:53:36 -04:00
lethosor 9b1d393c1c Append newline to each section of output 2014-05-15 17:30:42 -04:00
lethosor 2074f7e78b Fix handling of newline characters in command-prompt output 2014-05-15 15:51:03 -04:00
lethosor d52a07ef76 Dismiss previous command prompt before creating a new one 2014-05-14 18:56:30 -04:00
lethosor a516811bb1 Only allow 3dveins to be run in fortress mode
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
Alexander Gavrilov 56903b9374 Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop 2014-05-12 21:44:31 +04:00
lethosor b166f51568 Handle missing arguments to filter/paint in tiletypes 2014-05-11 14:17:56 -04:00
Alexander Gavrilov e829b2eea4 Fix missing newline and update Readme.html 2014-05-11 16:05:00 +04:00
Alexander Gavrilov ae8d630cfa Merge remote-tracking branch 'warmist/dev-rendermax' into develop 2014-05-11 15:44:29 +04:00