Commit Graph

3202 Commits (bd8a6c31bac933b21b889ea18d80823670ed927a)

Author SHA1 Message Date
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
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