Commit Graph

3191 Commits (4007c394384ebce6bdfeadb5dc48568ff41dbcdc)

Author SHA1 Message Date
lethosor bdc746f3f1 Replace broken include guard 2017-07-12 16:53:09 -04:00
lethosor 018f3be70a Merge remote-tracking branch 'JapaMala/master' into develop 2017-07-12 16:52:30 -04:00
Ben Lubar f963d89e12 Merge branch 'develop' into plugin-orders 2017-07-11 15:12:40 -05:00
lethosor 070dfa1865 Merge branch 'develop' of dfhack/dfhack into develop 2017-07-05 23:57:35 -04:00
lethosor 2d07e5edea Add new "pathable" plugin 2017-07-05 23:54:55 -04:00
Japa 03772a6899 Don't support windmill direction on old DF 2017-07-04 21:10:59 +05:30
Japa 8a0777bb1e Add stdint.h to the buildingreader header. 2017-07-04 20:51:25 +05:30
Ben Lubar 069cea675c
Split import and clear into two commands. Use for-each loops for clarity. Closes #965. 2017-07-02 16:00:45 -05:00
Ben Lubar 7b3ce20167
Add orders plugin for managing manager orders. 2017-07-02 14:02:55 -05:00
Quietust fd68971ac5 Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches 2017-07-02 07:31:31 -06:00
Japa 96dd5799f7 Add compatibility defines for 0.34.11 2017-06-30 01:00:31 +05:30
Ben Lubar 967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active. 2017-06-27 13:47:33 -05:00
lethosor fe8be90992 Add "tweak burrow-name-cancel" to fix bug 1518
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1518

Closes #526
2017-06-25 16:42:30 -04:00
lethosor 10e13c532a Add "tweak cage-butcher" and some extra Building module functions
* Buildings::markedForRemoval()
* Buildings::getCageOccupants()

Closes #906
2017-06-25 15:27:21 -04:00
Japa Illo c9b5df8989 Merge develop 2017-06-24 11:00:14 +05:30
Japa Illo 52b9a8f4ad Added a function to get a subset of the plant raws. 2017-06-24 10:52:09 +05:30
lethosor bf8e65311b Update submodules 2017-06-23 12:43:38 -04:00
Japa 31dbb792ca Added a function to get a partial creature raw list. 2017-06-23 19:54:22 +05:30
Japa Illo a2f6c80298 Add compatibility defines to remotefortressreader.cpp 2017-06-23 16:02:30 +05:30
lethosor ae809afde7 Add Gui::refreshSidebar()
This handles feeding CURSOR_DOWN_Z and CURSOR_UP_Z properly, avoiding issues
when on the lowest z-level.
2017-06-23 00:02:21 -04:00
Japa ac0134568e Don't read empty rooms, and update version 2017-06-22 23:57:04 +05:30
Japa 34f55cec29 Merge remote-tracking branch 'origin/master' 2017-06-22 20:29:21 +05:30
Japa 0348de4880 Add a command to get the current RemoteFortressReader version 2017-06-22 20:29:10 +05:30
Japa Illo 9ae50279a1 Moved the version define into a header file, and fixed removing designations that are alreaddy converted to jobs. 2017-06-20 15:46:03 +05:30
Japa Illo 48f5fd7a39 Fix missing room info on sent buildings. 2017-06-20 11:06:37 +05:30
Japa Illo 96f9faea28 Merge remote-tracking branch 'DFHack/develop' 2017-06-20 10:51:52 +05:30
Japa Illo 3da9176c76 Update submodules 2017-06-20 10:51:41 +05:30
lethosor 65382473f7 Ruby: stop cpp_new from truncating vtable pointers
This fixes a crash in levers.rb, for instance.
2017-06-10 17:22:52 -04:00
lethosor 1321a64613 Remove lots of old/unused functions from the Units module 2017-06-10 17:21:34 -04:00
lethosor acf50b755f tweak hotkey-clear: fix label position 2017-06-08 11:20:56 -04:00
lethosor a19e268923 Make re-invoking command-prompt hide the current prompt 2017-06-07 15:00:30 -04:00
lethosor c3d5663320 Ruby: use Gui module to get selected unit
This allows "exterminate it" to work from command-prompt, among other things.

Fixes #1100
2017-06-06 23:34:34 -04:00
lethosor b2f05834d9 buildingplan: fix an issue preventing some numbers from being used in names 2017-06-03 18:25:49 -04:00
lethosor 9f18cb5bdc resume: use map y dimension and fix off-by-one error 2017-06-03 11:24:23 -04:00
lethosor 5278856b37 mousequery: Fix parameters to getDepthAt() 2017-06-02 15:39:23 -04:00
lethosor 62c9f2695a automaterial: use uicommon.h, draw to map 2017-06-02 15:00:51 -04:00
lethosor 43c4a88068 Move some checks in paintTile/readTile after hooks are called 2017-06-02 00:40:14 -04:00
lethosor 044b3a0789 resume: use uicommon and draw to map 2017-06-01 16:19:11 -04:00
lethosor 2681392e27 siege-engine: use map tiles 2017-05-31 12:12:52 -04:00
Japa 9f2eaf35f1 Merge remote-tracking branch 'DFHack/develop' 2017-05-31 19:52:53 +05:30
lethosor 2905376042 Fix multiple issues with the confirm plugin
- Only allow one confirmation to be open at once. This avoids situations where
  pressing "s" would open another confirmation instead of the settings screen
  (e.g. in the trade screen), and allows all confirmations to be implemented
  without priorities specified.
- Fix #821: close any active confirmations when they are disabled.
- Some misc. cleanup, C++11 features
- Fixed a memory leak
2017-05-27 00:26:14 -04:00
lethosor 49ea61562f uicommon: remove nullptr definition
This is available in GCC 4.8+ and MSVC 2015
2017-05-25 18:06:51 -04:00
Japa Illo addbb1a94f (Hopefully) send active-state wil all applicable buildings. 2017-05-25 15:38:31 +05:30
Japa 2d6dab0f24 Add a special case for retraction bridge direction 2017-05-23 21:41:34 +05:30
Japa 3f98cd3da0 Add active state to some building types. 2017-05-22 22:03:12 +05:30
lethosor 22de28c3ed embark-tools sand: hide indicator when it overlaps with confirmation window 2017-05-19 11:49:25 -04:00
lethosor b92095190f Update stonesense, scripts, xml 2017-05-18 20:52:41 -04:00
Japa 5831665231 Fix wrong units used between two bounding boxes. 2017-05-14 16:07:05 +05:30
Japa 4ec42f7994 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2017-05-14 11:17:09 +05:30
Japa 236561ff43 get the full building list in the requested area in one go, rather than several overlapping chunks. 2017-05-14 11:12:41 +05:30
lethosor d083b92e9c probe: display tiletype enum names as well 2017-05-10 12:40:57 -04:00
lethosor d42bfd7a1d Merge remote-tracking branch 'quietust/develop' into develop 2017-05-10 10:28:49 -04:00
lethosor 5d9a3cdc99 Merge branch 'develop' of dfhack/dfhack into develop 2017-05-09 13:51:38 -04:00
lethosor 88f9eaeebb stonesense: Disable overlay in STANDARD-based modes
Closes dfhack/dfhack#1078
2017-05-09 13:50:08 -04:00
lethosor 4dff218976 ruby: fix crash when unloading plugin on Windows 2017-05-09 13:49:07 -04:00
Quietust 67e60fdaa1 Fix issue #874 (revflood doesn't always see past constructed downstairs) 2017-05-07 13:23:33 -06:00
Japa de7ef79d76 Merge remote-tracking branch 'DFHack/develop' into develop 2017-05-07 19:24:39 +05:30
Japa a1f692686a Use forward slashes instead of underscored to separate building subtypes 2017-05-07 19:24:30 +05:30
lethosor d309839b74 Update stonesense - fix #1083 2017-05-06 15:15:32 -04:00
lethosor 3dc2c2259b Update getplants to use Designations module
Fixes #531
Fixes #1014
Fixes #1018
2017-05-06 00:11:07 -04:00
lethosor adaccceba7 autochop: fix display of unnamed burrows 2017-05-05 17:36:02 -04:00
lethosor 5c784f4ba3 autochop: Avoid moving menu options around when toggling burrows 2017-05-05 17:31:54 -04:00
lethosor a527091172 autochop: Fix marking/unmarking trees (use Designations module)
Fixes #656
Fixes #1076
Closes #1030
2017-05-04 21:51:16 -04:00
lethosor 690fec9d81 manipulator: show social activities in job column 2017-04-28 17:26:20 -04:00
lethosor 3cfbd735dc Update xml, stonesense, scripts 2017-04-23 17:14:22 -04:00
lethosor 098481c60d Merge branch 'develop' of dfhack/dfhack into develop 2017-04-19 13:45:45 -04:00
lethosor 06737644cd new tweak: hotkey-clear 2017-04-19 13:31:25 -04:00
Japa Illo e36e4fa1c1 Support archery target rotation in RemoteFortressReader 2017-04-05 15:35:48 +05:30
Japa Illo 06225dd896 Send building items and items kept in buildings separately. 2017-03-30 16:23:14 +05:30
Japa 7c626ba3c2 Actually add the versionInfo function to the RPC list. 2017-03-29 22:05:49 +05:30
Japa bbaf3210f1 Send DF version info over remoteFortressReader 2017-03-29 21:58:12 +05:30
Japa c244901c16 Removed end of line space. (Sorry, travis) 2017-03-29 20:22:09 +05:30
Japa 19a253c132 Merge remote-tracking branch 'DFHack/develop' into develop 2017-03-29 19:46:55 +05:30
lethosor 78cb4a31b9 New tweak: condition-material (fixes bug 9905)
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9905
2017-03-28 09:50:38 -04:00
Japa 5ea964b9cf Send building items with buildings. 2017-03-25 22:23:40 +05:30
lethosor aea76b7ef3 stockflow: make sure that manager order amounts are integers
Fixes #1044
2017-03-18 17:56:06 -04:00
lethosor 815bdb2e57 Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop 2017-03-18 00:51:37 -04:00
lethosor f7f05724aa Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-03-18 00:36:43 -04:00
lethosor 85e0daf15e stonesense: basic 64-bit OS X support 2017-03-18 00:34:07 -04:00
lethosor f17e9d3662 title-folder: fix SDL path on OS X
The Stonesense install script appears to do strange things which cause DF to
load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former
is loaded, loading the latter and calling SDL_WM_* functions from it will fail.

A better solution would be to remove parts of the Stonesense fix-libs-*.sh
script(s) that are causing this, since they don't appear to be needed, or
use dlsym() to find the already-opened library/symbols.
2017-03-18 00:31:25 -04:00
Japa 61c2fb0a11 Merged branch develop into develop 2017-03-18 00:26:01 +05:30
Japa e60d8de5fe Fix array out of bounds errors in remotefortressreader that were crashing linux. 2017-03-18 00:25:46 +05:30
lethosor 19695b4ee7 EventManager/eventful: Pass building ID pointers to event handlers
Previously, there was some disagreement over whether event handlers such as
Buildings::updateBuildings() took building pointers or building IDs shoved
into pointers. It turned out to be the latter, which, unfortunately, did not
compile on x64. Passing building IDs isn't possible in all cases, because
building event handlers can be called for recently-deleted buildings too.
Pointers to building IDs do work reliably, though.

Fixes #1003
2017-02-17 22:53:48 -05:00
lethosor ae92ae7948 Merge remote-tracking branch 'JapaMala/creatureRenamer' into develop 2017-02-09 23:25:55 -05:00
Japa Illo 0d8decd7ec Remove trailing whitespaces. 2017-02-08 10:54:42 +05:30
Japa Illo 2c19f6b237 remove rsize_t 2017-02-08 10:34:11 +05:30
Japa Illo 873feaee2b Added a function to the creature renamer to save a graphics pack file to set graphics for all the generated creatures. 2017-02-07 15:57:35 +05:30
Japa Illo 10bbd3cb39 Added a function to spit out a generated graphics pack file. Not done yet. 2017-02-07 11:19:45 +05:30
Japa Illo b151ad7c75 always make sure the name prefix has an underscore at the end of it. 2017-02-07 11:09:39 +05:30
Japa Illo f9b296884c Made the creature renamer work more than once on the same save, and changed the format of the resulting names. 2017-02-07 11:01:42 +05:30
Japa Illo 68faca09ee Added missing base types given by toady, and reorganized the list to look better. 2017-02-07 10:27:57 +05:30
Japa Illo 64e217132e Don't offset the raplacement by 1 since there's no space now. 2017-02-06 10:50:18 +05:30
Japa Illo 5b83c6fe68 Add spaces to search string programmatically. 2017-02-06 10:49:22 +05:30
Japa Illo 1aef1d1b98 use STD::Vector instead of a C array, and set version properly. 2017-02-06 10:42:10 +05:30
Japa Illo b18bd72c05 Replace tab with spaces. 2017-02-06 10:12:20 +05:30
lethosor 7823d78cd9 Update xml and embark-tools field name 2017-02-04 14:49:21 -05:00
lethosor f65a981099 Fix indentation 2017-02-04 14:46:38 -05:00
Japa Illo c8e6845a7f Send noble positions and professions along with Units. 2017-02-03 10:08:35 +05:30
Japa Illo d97b0497b3 Add prosession and noble position info to units. 2017-02-02 12:12:28 +05:30
Japa Illo c3c3f37b06 Added more descriptor types, and made it run on world load. 2017-01-26 15:58:43 +05:30