546841d194
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2017-12-31 14:33:03 +05:30
fa39220777
add projectiles, complete with velocity.
2017-12-31 14:31:58 +05:30
e72474613f
Add new PutItemOnDisplay job to labor management plugins
...
Also add building_type::DisplayFurniture to labormanager
Fixes #1208
2017-12-27 13:48:53 -05:00
cdfe1cf1c7
add a few more hotkeys to adventure control
2017-12-26 22:21:36 +05:30
e9e5113ff7
Add careful movement type to proto. Not used yet.
2017-12-26 12:34:46 +05:30
f5fc7fe1a1
Report the current adventure mode menu back to Armok Vision, currently including careful movement options.
2017-12-26 00:08:05 +05:30
e8ccfb4e4d
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2017-12-25 22:00:54 +05:30
5d32253b6e
added jumping ability to adventure control.
2017-12-25 22:00:45 +05:30
9b562aac73
Merge remote-tracking branch 'DFHack/develop' into remote_control
2017-12-25 10:45:37 +05:30
d6a6bf008e
Update xml, stonesense
...
Ref #1206
2017-12-24 23:17:39 -05:00
1408f7bfb3
Add a command to remotely send simple movement commands to an adventurer.
2017-12-24 18:33:25 +05:30
79467df263
Merge branch 'remote_reader' of https://github.com/JapaMala/dfhack.git
2017-12-20 17:21:46 +05:30
04b1a80654
Don't re-send all reports all the time.
2017-12-20 17:11:01 +05:30
e478c00ce5
Replace tab with space.
2017-12-19 11:20:12 +05:30
c4f9f6edb2
Add item stack size.
2017-12-17 18:42:03 +05:30
29282a238b
Bring in changes from the remoteServerUnsafe branch.
2017-12-17 18:05:38 +05:30
bbd823f5b0
Simplify logic in createitem, to avoid similar errors in the future
2017-12-16 15:40:39 -06:00
b1e77fa260
createitem: fix an issue with items teleporting to the location of another unit
...
This was due to moveToGround() being called twice, first with the location of
world.units.active[0], which caused the item to teleport to that location later.
Fixes #1198
2017-12-16 16:09:43 -05:00
23bb8c4f3d
Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor
2017-12-07 14:37:15 -05:00
88c7e493b8
Merge ui_area_map_width into ui_menu_width, now a 2-byte array
2017-12-03 20:34:59 -06:00
a0634f9ee0
Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe
2017-11-25 11:50:56 +05:30
7fd2586f62
Remove trailing whitespace
2017-11-25 11:39:15 +05:30
4a52f322c3
Remove tabs.
2017-11-25 11:37:54 +05:30
2c95ac411e
Update xml and all uses of job_handler
2017-11-25 00:59:59 -05:00
272f51ef4b
Merge remote-tracking branch 'remotes/DFHack/master' into RemoteServerUnsafe
2017-11-25 10:24:51 +05:30
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
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
9259cb22d2
Merge pull request #1184 from quietust/develop
...
update structures
2017-11-23 11:57:41 -05:00
e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 10:55:37 -06:00
e3a41a323d
Update Units
2017-11-05 16:06:51 +05:30
53b5a5cc6f
Added a function to only get details for units within the area of interest.
2017-11-04 20:14:24 +05:30
33a43c5bfd
update structures
2017-11-04 07:50:47 -06:00
b449446526
Send announcements in Unicode.
2017-10-30 19:23:17 +05:30
117b6e0427
Send reports over RFR.
2017-10-30 19:00:03 +05:30
e51ae78a46
Always follow the current adventure in adventure mode.
2017-10-22 13:37:23 +05:30
b480cd6b38
Mark RFR functions as being safe for network use.
2017-10-20 19:07:47 +05:30
322964f0e6
Switch to explicit `interface_key` values instead of char.
2017-10-17 16:06:33 -06:00
3c564c64ba
Fix tabs.
2017-10-17 15:17:35 -06:00
d009022311
Add tree product exclusions to autochop
2017-10-17 13:43:20 -06:00
cc595d7a4e
Fix fencepost error in orders import. Fixes #1177 .
2017-10-16 14:01:23 -05:00
c080da3750
listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux
2017-10-08 19:54:51 -06:00
c2b36f0979
Removed extra qualification to make Travis happy.
2017-09-01 17:29:55 +02:00
8a81f6b5f7
Removed extra qualification to make Travis happy.
2017-09-01 17:14:21 +02:00
596296358f
Moved all externally visible operation implementations out of name spaces to satisfy both Travis and Visual Studio.
2017-09-01 17:00:14 +02:00
84eaf04148
Removed function qualifications to make Travis happy and Visual Studio unhappy.
2017-09-01 16:22:10 +02:00
83061cffca
Replaced include of dfhack.h with <utility> and DataDefs.h
2017-09-01 15:37:40 +02:00
831fa07fb2
Removed path from dfhack.h include.
2017-09-01 15:10:53 +02:00
80fe49b339
Add embark-assistant plugin
2017-09-01 14:13:34 +02:00
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
54b0d2fcb6
Merge pull request #1154 from JapaMala/master
...
RemoteFortressReader updates.
2017-08-22 10:48:47 -04:00
a7b837f2d0
Increment version number
2017-08-20 20:44:55 +05:30
8e71cf9def
Send Unit inventories with RFR
2017-08-19 17:48:18 +05:30
737aefefea
send over beard styles
2017-08-19 09:38:56 +05:30
5b5ac7088d
correct spelling
2017-08-12 19:12:14 +05:30
b7783ba8b9
Added unkept hair to style list
2017-08-12 19:10:35 +05:30
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
6c5e25db13
Add hair style to units in proto
2017-08-11 13:50:30 +05:30
55d22855a0
Add styling enums to RFR
2017-08-11 10:21:40 +05:30
95aa5bbb47
zoom: fix MSVC warning
2017-08-07 15:06:00 -04:00
1bf64ddfd8
Merge remote-tracking branch 'ab9rf/labormanager-1115' into develop
2017-08-07 14:04:05 -04:00
14867c36cc
Merge remote-tracking branch 'ab9rf/labormanager-1106' into develop
2017-08-07 14:00:37 -04:00
eb7e9dcf1f
Merge remote-tracking branch 'ab9rf/labormanager-1103' into develop
2017-08-07 14:00:15 -04:00
05b238c879
Fix another diggingInvaders compiler error
...
Windows-specific, for some strange reason
Ref #1145
2017-08-07 09:30:27 -04:00
a383cc9a30
Fix diggingInvaders compilation errors ( #1145 , GCC 4.8)
2017-08-06 21:01:36 -04:00
ab8fb9f44e
whitespace
2017-08-05 21:48:41 -05:00
b61859a55e
labormanager/#1103: fix NPE in meeting test
2017-08-04 11:29:48 -05:00
04733827a0
Favor/disfavor RECOVER_WOUNDED based on ALTRUISM ( fixes #1106 )
2017-07-29 19:54:51 -05:00
d98fd02048
Weight CUTWOOD jobs by KILL_PLANT ethic; fix #1115
2017-07-29 18:46:45 -05:00
682d4b3144
whitespace
2017-07-29 12:26:32 -05:00
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
c5c80d5dc0
Rename labormanager_joblabormapper to joblabormapper
2017-07-28 23:03:23 -05:00
d810faa4a3
whitespace
2017-07-28 02:43:32 -05:00
a7d21fd627
move labormanager into a subdirectory
2017-07-28 02:28:16 -05:00
8ae7a1235d
Add rider ID to creatures
2017-07-27 18:41:46 +05:30
92a962a9c0
Send grass levels over RemoteFortressReader
2017-07-25 08:31:02 +05:30
fd19935fe9
labormanager: remove stupid
2017-07-22 04:54:05 -05:00
15ae72edec
labormanager: Refactor source, separating the job labor mapper into a separate source file.
2017-07-22 04:31:30 -05:00
90dd9e932e
exclude on-duty military personnel from health labor check
2017-07-20 03:54:00 -05:00
1ee5debfba
Send the existence of all buildings on the map.
2017-07-17 15:29:23 +05:30
c5fad31a4c
Fix indentation
2017-07-12 16:55:50 -04:00
bdc746f3f1
Replace broken include guard
2017-07-12 16:53:09 -04:00
018f3be70a
Merge remote-tracking branch 'JapaMala/master' into develop
2017-07-12 16:52:30 -04:00
f963d89e12
Merge branch 'develop' into plugin-orders
2017-07-11 15:12:40 -05:00
070dfa1865
Merge branch 'develop' of dfhack/dfhack into develop
2017-07-05 23:57:35 -04:00
2d07e5edea
Add new "pathable" plugin
2017-07-05 23:54:55 -04:00
03772a6899
Don't support windmill direction on old DF
2017-07-04 21:10:59 +05:30
8a0777bb1e
Add stdint.h to the buildingreader header.
2017-07-04 20:51:25 +05:30
069cea675c
Split import and clear into two commands. Use for-each loops for clarity. Closes #965 .
2017-07-02 16:00:45 -05:00
7b3ce20167
Add orders plugin for managing manager orders.
2017-07-02 14:02:55 -05:00
fd68971ac5
Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches
2017-07-02 07:31:31 -06:00
96dd5799f7
Add compatibility defines for 0.34.11
2017-06-30 01:00:31 +05:30
967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active.
2017-06-27 13:47:33 -05:00
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
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
c9b5df8989
Merge develop
2017-06-24 11:00:14 +05:30
52b9a8f4ad
Added a function to get a subset of the plant raws.
2017-06-24 10:52:09 +05:30
bf8e65311b
Update submodules
2017-06-23 12:43:38 -04:00
31dbb792ca
Added a function to get a partial creature raw list.
2017-06-23 19:54:22 +05:30
a2f6c80298
Add compatibility defines to remotefortressreader.cpp
2017-06-23 16:02:30 +05:30
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
ac0134568e
Don't read empty rooms, and update version
2017-06-22 23:57:04 +05:30
34f55cec29
Merge remote-tracking branch 'origin/master'
2017-06-22 20:29:21 +05:30
0348de4880
Add a command to get the current RemoteFortressReader version
2017-06-22 20:29:10 +05:30
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
48f5fd7a39
Fix missing room info on sent buildings.
2017-06-20 11:06:37 +05:30
96f9faea28
Merge remote-tracking branch 'DFHack/develop'
2017-06-20 10:51:52 +05:30
3da9176c76
Update submodules
2017-06-20 10:51:41 +05:30
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
1321a64613
Remove lots of old/unused functions from the Units module
2017-06-10 17:21:34 -04:00
acf50b755f
tweak hotkey-clear: fix label position
2017-06-08 11:20:56 -04:00
a19e268923
Make re-invoking command-prompt hide the current prompt
2017-06-07 15:00:30 -04:00
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
b2f05834d9
buildingplan: fix an issue preventing some numbers from being used in names
2017-06-03 18:25:49 -04:00
9f18cb5bdc
resume: use map y dimension and fix off-by-one error
2017-06-03 11:24:23 -04:00
5278856b37
mousequery: Fix parameters to getDepthAt()
2017-06-02 15:39:23 -04:00
62c9f2695a
automaterial: use uicommon.h, draw to map
2017-06-02 15:00:51 -04:00
43c4a88068
Move some checks in paintTile/readTile after hooks are called
2017-06-02 00:40:14 -04:00
044b3a0789
resume: use uicommon and draw to map
2017-06-01 16:19:11 -04:00
2681392e27
siege-engine: use map tiles
2017-05-31 12:12:52 -04:00
9f2eaf35f1
Merge remote-tracking branch 'DFHack/develop'
2017-05-31 19:52:53 +05:30
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
49ea61562f
uicommon: remove nullptr definition
...
This is available in GCC 4.8+ and MSVC 2015
2017-05-25 18:06:51 -04:00
addbb1a94f
(Hopefully) send active-state wil all applicable buildings.
2017-05-25 15:38:31 +05:30
2d6dab0f24
Add a special case for retraction bridge direction
2017-05-23 21:41:34 +05:30
3f98cd3da0
Add active state to some building types.
2017-05-22 22:03:12 +05:30
22de28c3ed
embark-tools sand: hide indicator when it overlaps with confirmation window
2017-05-19 11:49:25 -04:00
b92095190f
Update stonesense, scripts, xml
2017-05-18 20:52:41 -04:00
5831665231
Fix wrong units used between two bounding boxes.
2017-05-14 16:07:05 +05:30
4ec42f7994
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2017-05-14 11:17:09 +05:30
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
d083b92e9c
probe: display tiletype enum names as well
2017-05-10 12:40:57 -04:00
d42bfd7a1d
Merge remote-tracking branch 'quietust/develop' into develop
2017-05-10 10:28:49 -04:00
5d9a3cdc99
Merge branch 'develop' of dfhack/dfhack into develop
2017-05-09 13:51:38 -04:00
88f9eaeebb
stonesense: Disable overlay in STANDARD-based modes
...
Closes dfhack/dfhack#1078
2017-05-09 13:50:08 -04:00
4dff218976
ruby: fix crash when unloading plugin on Windows
2017-05-09 13:49:07 -04:00
67e60fdaa1
Fix issue #874 (revflood doesn't always see past constructed downstairs)
2017-05-07 13:23:33 -06:00
de7ef79d76
Merge remote-tracking branch 'DFHack/develop' into develop
2017-05-07 19:24:39 +05:30
a1f692686a
Use forward slashes instead of underscored to separate building subtypes
2017-05-07 19:24:30 +05:30
d309839b74
Update stonesense - fix #1083
2017-05-06 15:15:32 -04:00
3dc2c2259b
Update getplants to use Designations module
...
Fixes #531
Fixes #1014
Fixes #1018
2017-05-06 00:11:07 -04:00
adaccceba7
autochop: fix display of unnamed burrows
2017-05-05 17:36:02 -04:00
5c784f4ba3
autochop: Avoid moving menu options around when toggling burrows
2017-05-05 17:31:54 -04:00
a527091172
autochop: Fix marking/unmarking trees (use Designations module)
...
Fixes #656
Fixes #1076
Closes #1030
2017-05-04 21:51:16 -04:00
690fec9d81
manipulator: show social activities in job column
2017-04-28 17:26:20 -04:00
3cfbd735dc
Update xml, stonesense, scripts
2017-04-23 17:14:22 -04:00
098481c60d
Merge branch 'develop' of dfhack/dfhack into develop
2017-04-19 13:45:45 -04:00
06737644cd
new tweak: hotkey-clear
2017-04-19 13:31:25 -04:00
e36e4fa1c1
Support archery target rotation in RemoteFortressReader
2017-04-05 15:35:48 +05:30
06225dd896
Send building items and items kept in buildings separately.
2017-03-30 16:23:14 +05:30
7c626ba3c2
Actually add the versionInfo function to the RPC list.
2017-03-29 22:05:49 +05:30
Japa
lethosor
Quietust
Lethosor
Ben Lubar
David Timm
PatrikLundell
ViTuRaS
Warmist
Kelly Kinkade
Ben Lubar