Commit Graph

3223 Commits (7439f7fba7e15982ed53e564a919e8df4b2782ab)

Author SHA1 Message Date
Japa 7439f7fba7 Merge remote-tracking branch 'DFHack/develop' into remote_control
# Conflicts:
#	scripts
2018-01-19 22:11:48 +05:30
Japa 58bef276de send item imrpovements 2018-01-19 08:25:16 +05:30
lethosor 1ed6c70663 dwarfmonitor: Add "view unit" option to prefs screen 2018-01-18 10:17:54 -05:00
lethosor 74aefddd75 dwarfmonitor: Use a reasonable default for unhandled item types 2018-01-18 10:17:40 -05:00
lethosor b035d9e53a ListColumn: only change items' foreground color in selected columns 2018-01-18 10:05:31 -05:00
lethosor 7b16cf1619 dwarfmonitor: actually display creature names 2018-01-18 09:54:33 -05:00
lethosor 9515a9e4f5 dwarfmonitor: use interface_key overload of OutputHotkeyString, grey out unit option 2018-01-18 01:14:30 -05:00
lethosor 5f588b376a dwarfmonitor: make handling of unrecognized preferences more obvious 2018-01-18 01:07:20 -05:00
lethosor 4e2c6194ca dwarfmonitor: support poetic/musical/dance forms 2018-01-18 01:06:55 -05:00
lethosor 909776571e dwarfmonitor: support getSelectedUnit 2018-01-18 01:06:03 -05:00
lethosor f2890620d1 Remove tweak kitchen-keys - DF bug 614 was fixed 2018-01-18 01:05:33 -05:00
Japa a63347cf7a Move item reader to a separate file. 2018-01-17 19:10:19 +05:30
Japa ea6757377e add item volume to RFR 2018-01-16 17:04:26 +05:30
Japa Mala Illo 9ba0b00580 Remove the stupid big warning comment. 2018-01-12 11:59:02 +05:30
Japa Mala Illo 8d6e30ef0e Fix whitespace issues 2018-01-12 11:50:40 +05:30
Japa Mala Illo 56c76d5abc Merge remote-tracking branch 'DFHack/develop' into remote_control
# Conflicts:
#	scripts
2018-01-12 11:17:22 +05:30
lethosor 2782008b42 Update tweak condition-material with new field names
dfhack/df-structures#236
2018-01-10 19:53:25 -05:00
Japa Mala Illo 724fb00b73 Use an inteligenter method of setting the gem shapes. 2018-01-08 09:58:37 +05:30
Japa 29426111f7 Send shapes for small gems too. 2018-01-07 01:14:15 +05:30
Japa d80d16ddc3 Actually send gem shape. 2018-01-07 00:50:32 +05:30
Japa d0a924a207 Send shape ids through RFR 2018-01-06 23:48:06 +05:30
Japa bd8a6c31ba Send vehicles over remoteFortressReader, and don't send every block like a retard. 2018-01-06 22:07:34 +05:30
Japa 546841d194 Merge remote-tracking branch 'DFHack/develop' into remote_control
# Conflicts:
#	scripts
2017-12-31 14:33:03 +05:30
Japa fa39220777 add projectiles, complete with velocity. 2017-12-31 14:31:58 +05:30
lethosor 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
Japa cdfe1cf1c7 add a few more hotkeys to adventure control 2017-12-26 22:21:36 +05:30
Japa Mala Illo e9e5113ff7 Add careful movement type to proto. Not used yet. 2017-12-26 12:34:46 +05:30
Japa f5fc7fe1a1 Report the current adventure mode menu back to Armok Vision, currently including careful movement options. 2017-12-26 00:08:05 +05:30
Japa e8ccfb4e4d Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control 2017-12-25 22:00:54 +05:30
Japa 5d32253b6e added jumping ability to adventure control. 2017-12-25 22:00:45 +05:30
Japa Mala Illo 9b562aac73 Merge remote-tracking branch 'DFHack/develop' into remote_control 2017-12-25 10:45:37 +05:30
lethosor d6a6bf008e Update xml, stonesense
Ref #1206
2017-12-24 23:17:39 -05:00
Japa 1408f7bfb3 Add a command to remotely send simple movement commands to an adventurer. 2017-12-24 18:33:25 +05:30
Japa 79467df263 Merge branch 'remote_reader' of https://github.com/JapaMala/dfhack.git 2017-12-20 17:21:46 +05:30
Japa 04b1a80654 Don't re-send all reports all the time. 2017-12-20 17:11:01 +05:30
Japa e478c00ce5
Replace tab with space. 2017-12-19 11:20:12 +05:30
Japa c4f9f6edb2 Add item stack size. 2017-12-17 18:42:03 +05:30
Japa 29282a238b Bring in changes from the remoteServerUnsafe branch. 2017-12-17 18:05:38 +05:30
Quietust bbd823f5b0 Simplify logic in createitem, to avoid similar errors in the future 2017-12-16 15:40:39 -06:00
lethosor 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
lethosor 23bb8c4f3d Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor 2017-12-07 14:37:15 -05:00
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