40654954a1
Partial preparation for 0.44.07-alpha1.
...
Still need to write release notes and add tags.
2018-03-13 15:49:42 -05:00
ad57037711
Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop
2018-03-10 17:02:34 -05:00
db95796d4c
Many build fixes
2018-03-10 16:53:45 -05:00
a810960bde
Support spiderwebs and add a fake flow type for campfires.
2018-03-10 21:02:28 +05:30
acd4adc7cc
Fix CMake warning about CMP0022 policy being set as "OLD".
2018-03-08 02:28:28 -06:00
3e7da4d5f2
FIx wrong material being sent with item flows.
2018-03-06 22:37:26 +05:30
c3f931652d
Send item cloud info properly.
2018-03-06 09:44:21 +05:30
c765e12254
Store tool names in RFR
2018-03-05 19:00:18 +05:30
ebf9651896
Include Materials in flows.
2018-03-04 02:41:40 +05:30
894f6c232b
actually copy flows with the block this time.
2018-03-03 12:48:09 +05:30
3f26d4fe09
Add flows to RFR
2018-03-03 11:41:58 +05:30
ef24da0cd3
Key references on overlay as well
2018-02-27 21:06:07 +01:00
490fbd8b26
send instrument description using UTF8
2018-02-27 21:18:15 +05:30
65e549848d
fix some crashes in the new instrument reader code.
2018-02-27 21:01:38 +05:30
d758104f5e
update stonesense for RFR protos
2018-02-27 20:24:32 +05:30
265e229d61
Send all relavent generated instruement information over RFR
2018-02-27 19:58:07 +05:30
578d6666eb
Addressed request. Improved profile saving
2018-02-27 10:46:06 +01:00
7705eada5a
Added magma/candy search + profile save/load.
2018-02-26 18:31:33 +01:00
2277c4ee4e
Corrected reanimation detection
2018-02-25 10:28:38 +01:00
800dde360d
Merge pull request #1223 from JapaMala/remote_control
...
Remote control
2018-02-21 23:04:53 -05:00
9f9d90c2ef
Fix labormanager never assigning dwarves to fill ponds, making irrigation very difficult.
2018-02-21 18:46:21 -06:00
778a1667dc
...also do it for images.
2018-02-21 22:31:39 +05:30
8c20d178b5
Include plant type with plant items.
2018-02-21 22:27:04 +05:30
1c97f58340
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-21 21:29:58 +05:30
6e3b29930d
Avoid crash in dwarfvet due to negative width/height
...
Partial fix for #1227
2018-02-16 15:12:46 -05:00
7758fb6df5
dwarfvet: fix another log message, misc readability improvements
2018-02-16 02:32:53 -05:00
36f4954182
Update Stonesense and build docs (fixed Allegro download)
2018-02-16 02:16:06 -05:00
94b2ca68d8
dwarfvet: fix extra % in log message
...
Mentioned in #1227
2018-02-13 11:19:10 -05:00
60e9839f63
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-13 21:29:09 +05:30
18cf70a543
Update Stonesense.
2018-02-13 12:37:45 +05:30
7b19c9b8f0
Merge remote-tracking branch 'remotes/DFHack/develop' into RemoteServerUnsafe
...
# Conflicts:
# plugins/proto/RemoteFortressReader.proto
# plugins/remotefortressreader/remotefortressreader.cpp
# scripts
2018-02-12 20:19:40 +05:30
3a122d7391
Merge remote-tracking branch 'danamlund/better-fps-counter' into develop
2018-02-12 01:21:14 -05:00
6260062d05
Add basic embark-assistant docs ( closes #1226 )
2018-02-11 03:08:02 -05:00
ca29cb8e6f
embark-assistant: update field names, now compiles
2018-02-10 17:51:02 -05:00
ef3adbe816
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-02-10 17:27:13 -05:00
9a0befa4cb
Show number of trees skipped
2018-02-10 03:03:07 -05:00
342f193409
autochop: store skip settings in one field, fix double colon and initial load
...
language_name fields default to -1, so the new settings could have been enabled
on all worlds by default.
2018-02-10 02:07:36 -05:00
6a758c70a8
Merge remote-tracking branch 'dtimm/develop' into develop
2018-02-10 01:47:06 -05:00
55f5439ddf
dwarfmonitor: remove unused hook, use CoreSuspendClaimer
2018-02-09 02:07:08 -05:00
6d33069fe9
Fix more copy-paste errors
2018-02-05 10:41:36 -05:00
7f8ea9e82c
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-05 20:11:55 +05:30
9a032ac447
I'm a moron.
2018-02-05 20:11:47 +05:30
b2a19dedeb
load-art-image-chunk: safety check
2018-02-04 22:56:24 -05:00
78061085c6
Add art image properties to RFR
2018-02-04 16:02:02 +05:30
60c1bd3c66
Merge remote-tracking branch 'refs/remotes/DFHack/develop'
...
Conflicts:
library/xml
2018-02-04 10:26:39 +05:30
ed406e0e3d
fix naming and return statement.
2018-02-04 10:24:51 +05:30
c621a29fe3
Fix global name.
2018-02-04 10:21:28 +05:30
38140fb450
Copy engravings in RFR, and update the art image function.
2018-02-04 10:12:15 +05:30
bdba95f90c
memview: check for tags from sizecheck
2018-02-03 18:10:16 -05:00
6181b2bce3
Add tweak that replaces dwarf mode FPS counter with one that does not count when paused
2018-02-03 17:58:24 +01:00
8665600574
Send tiles for shape descriptors, and art image ids.
2018-02-03 10:38:17 +05:30
e63a871363
use the vmethod for getting improvement images.
2018-01-31 10:11:43 +05:30
9aaeecb4d6
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-01-28 13:41:52 +05:30
788a48144b
dig: fix issues with priority parameters and digvx/diglx
2018-01-28 02:16:57 -05:00
b78b2feed2
Remove extra whitespace.
2018-01-28 10:12:50 +05:30
ca3b2b30b3
fix compiling on gcc.
2018-01-27 19:26:30 +05:30
341c0dacf3
updated function definition for win64.
2018-01-27 12:44:51 +05:30
aff9c22875
update submodules.
2018-01-26 08:27:03 +05:30
e3d95daf45
Don't use globals
2018-01-26 08:19:41 +05:30
5e0e674580
Update submodules
2018-01-25 10:56:08 -05:00
ef451a2f2d
Got the image reader function working.
2018-01-25 20:24:12 +05:30
f1b8fa305b
try using the new function pointer.
2018-01-25 11:55:46 +05:30
68324dfe0b
Send statue images.
2018-01-25 07:53:19 +05:30
ee7ad348f0
add item images
2018-01-24 12:09:05 +05:30
42bbe124b7
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2018-01-24 10:24:23 +05:30
f75b116ae2
Added the rest of the relavent improvement headers.
2018-01-24 10:22:45 +05:30
f33c42a49e
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-24 10:04:51 +05:30
1ba5477b63
Add designation priority support to MapCache and dig plugin
...
Fixes #481
2018-01-21 19:27:16 -05:00
7439f7fba7
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-19 22:11:48 +05:30
58bef276de
send item imrpovements
2018-01-19 08:25:16 +05:30
1ed6c70663
dwarfmonitor: Add "view unit" option to prefs screen
2018-01-18 10:17:54 -05:00
74aefddd75
dwarfmonitor: Use a reasonable default for unhandled item types
2018-01-18 10:17:40 -05:00
b035d9e53a
ListColumn: only change items' foreground color in selected columns
2018-01-18 10:05:31 -05:00
7b16cf1619
dwarfmonitor: actually display creature names
2018-01-18 09:54:33 -05:00
9515a9e4f5
dwarfmonitor: use interface_key overload of OutputHotkeyString, grey out unit option
2018-01-18 01:14:30 -05:00
5f588b376a
dwarfmonitor: make handling of unrecognized preferences more obvious
2018-01-18 01:07:20 -05:00
4e2c6194ca
dwarfmonitor: support poetic/musical/dance forms
2018-01-18 01:06:55 -05:00
909776571e
dwarfmonitor: support getSelectedUnit
2018-01-18 01:06:03 -05:00
f2890620d1
Remove tweak kitchen-keys - DF bug 614 was fixed
2018-01-18 01:05:33 -05:00
a63347cf7a
Move item reader to a separate file.
2018-01-17 19:10:19 +05:30
ea6757377e
add item volume to RFR
2018-01-16 17:04:26 +05:30
9ba0b00580
Remove the stupid big warning comment.
2018-01-12 11:59:02 +05:30
8d6e30ef0e
Fix whitespace issues
2018-01-12 11:50:40 +05:30
56c76d5abc
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-12 11:17:22 +05:30
2782008b42
Update tweak condition-material with new field names
...
dfhack/df-structures#236
2018-01-10 19:53:25 -05:00
724fb00b73
Use an inteligenter method of setting the gem shapes.
2018-01-08 09:58:37 +05:30
29426111f7
Send shapes for small gems too.
2018-01-07 01:14:15 +05:30
d80d16ddc3
Actually send gem shape.
2018-01-07 00:50:32 +05:30
d0a924a207
Send shape ids through RFR
2018-01-06 23:48:06 +05:30
bd8a6c31ba
Send vehicles over remoteFortressReader, and don't send every block like a retard.
2018-01-06 22:07:34 +05:30
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
Ben Lubar
lethosor
Japa
PatrikLundell
Lethosor
Dan Amlund
Quietust
David Timm
ViTuRaS
Warmist
Kelly Kinkade
Ben Lubar