Commit Graph

3232 Commits (e3d95daf45f87eab53515975e779cf58aa80a595)

Author SHA1 Message Date
Quietust 88c7e493b8 Merge ui_area_map_width into ui_menu_width, now a 2-byte array 2017-12-03 20:34:59 -06:00
lethosor 2c95ac411e Update xml and all uses of job_handler 2017-11-25 00:59:59 -05:00
Lethosor c8cd2f40bc
Merge pull request #1188 from BenLubar/labormanager-culture-crash
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 16:22:44 -05:00
Lethosor 1d679e713e
Merge pull request #1156 from ViTuRaS/patch-1
max_barrels was serialized on max_bins position
2017-11-23 11:58:08 -05:00
Lethosor 9259cb22d2
Merge pull request #1184 from quietust/develop
update structures
2017-11-23 11:57:41 -05:00
Ben Lubar e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity 2017-11-23 10:55:37 -06:00
Quietust 33a43c5bfd update structures 2017-11-04 07:50:47 -06:00
Ben Lubar cc595d7a4e
Fix fencepost error in orders import. Fixes #1177. 2017-10-16 14:01:23 -05:00
Quietust c080da3750 listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux 2017-10-08 19:54:51 -06:00
ViTuRaS ca481fc69f max_barrels was serialized on max_bins position
When I save and load stockpile settings with stockpile management plugin, then saved barrels count will be loaded in bins and barrels are zero. So I think this change should correct it.
2017-08-28 22:33:24 +02:00
Lethosor 54b0d2fcb6 Merge pull request #1154 from JapaMala/master
RemoteFortressReader updates.
2017-08-22 10:48:47 -04:00
Japa a7b837f2d0 Increment version number 2017-08-20 20:44:55 +05:30
Japa 8e71cf9def Send Unit inventories with RFR 2017-08-19 17:48:18 +05:30
Japa 737aefefea send over beard styles 2017-08-19 09:38:56 +05:30
Japa 5b5ac7088d correct spelling 2017-08-12 19:12:14 +05:30
Japa b7783ba8b9 Added unkept hair to style list 2017-08-12 19:10:35 +05:30
Warmist 620cfcc8bd Fix luasocket receive with byte count
Did not correctly detect when you typed in a number instead of pattern.
2017-08-12 15:42:56 +03:00
Japa 6c5e25db13 Add hair style to units in proto 2017-08-11 13:50:30 +05:30
Japa 55d22855a0 Add styling enums to RFR 2017-08-11 10:21:40 +05:30
lethosor 95aa5bbb47 zoom: fix MSVC warning 2017-08-07 15:06:00 -04:00
lethosor 1bf64ddfd8 Merge remote-tracking branch 'ab9rf/labormanager-1115' into develop 2017-08-07 14:04:05 -04:00
lethosor 14867c36cc Merge remote-tracking branch 'ab9rf/labormanager-1106' into develop 2017-08-07 14:00:37 -04:00
lethosor eb7e9dcf1f Merge remote-tracking branch 'ab9rf/labormanager-1103' into develop 2017-08-07 14:00:15 -04:00
lethosor 05b238c879 Fix another diggingInvaders compiler error
Windows-specific, for some strange reason

Ref #1145
2017-08-07 09:30:27 -04:00
lethosor a383cc9a30 Fix diggingInvaders compilation errors (#1145, GCC 4.8) 2017-08-06 21:01:36 -04:00
Kelly Kinkade ab8fb9f44e whitespace 2017-08-05 21:48:41 -05:00
Kelly Kinkade b61859a55e labormanager/#1103: fix NPE in meeting test 2017-08-04 11:29:48 -05:00
Kelly Kinkade 04733827a0 Favor/disfavor RECOVER_WOUNDED based on ALTRUISM (fixes #1106) 2017-07-29 19:54:51 -05:00
Kelly Kinkade d98fd02048 Weight CUTWOOD jobs by KILL_PLANT ethic; fix #1115 2017-07-29 18:46:45 -05:00
Kelly Kinkade 682d4b3144 whitespace 2017-07-29 12:26:32 -05:00
Kelly Kinkade fe9454ff1c Fix #1103: do not idle for a meeting if the other participant is dead, asleep, resting, or on military duty 2017-07-29 09:26:19 -05:00
Kelly Kinkade c5c80d5dc0 Rename labormanager_joblabormapper to joblabormapper 2017-07-28 23:03:23 -05:00
Kelly Kinkade d810faa4a3 whitespace 2017-07-28 02:43:32 -05:00
Kelly Kinkade a7d21fd627 move labormanager into a subdirectory 2017-07-28 02:28:16 -05:00
Japa 8ae7a1235d Add rider ID to creatures 2017-07-27 18:41:46 +05:30
Japa 92a962a9c0 Send grass levels over RemoteFortressReader 2017-07-25 08:31:02 +05:30
Kelly Kinkade fd19935fe9 labormanager: remove stupid 2017-07-22 04:54:05 -05:00
Kelly Kinkade 15ae72edec labormanager: Refactor source, separating the job labor mapper into a separate source file. 2017-07-22 04:31:30 -05:00
Kelly Kinkade 90dd9e932e exclude on-duty military personnel from health labor check 2017-07-20 03:54:00 -05:00
Japa Illo 1ee5debfba Send the existence of all buildings on the map. 2017-07-17 15:29:23 +05:30
lethosor c5fad31a4c Fix indentation 2017-07-12 16:55:50 -04:00
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