Commit Graph

9829 Commits (3b4d6de454617241c5042d1fc8d05c358eec2921)
 

Author SHA1 Message Date
lethosor 3a2fc6f65f Update stonesense 2018-03-14 09:40:21 -04:00
Lethosor 9b6b73b1d2
Merge pull request #1232 from JapaMala/remote_reader
Remote reader
2018-03-14 09:31:56 -04:00
lethosor 02569b1dac Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-03-14 09:29:35 -04:00
lethosor 40d3b9b782 embark-assistant: fix copy-paste error, update docs (#1231) 2018-03-14 09:28:24 -04:00
lethosor 1e7a38f0b1 Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2018-03-14 09:24:47 -04:00
Japa 4d74f66b64 Merge remote-tracking branch 'DFHack/develop' into remote_reader 2018-03-14 16:18:03 +05:30
Japa 09bc1c3169 add ocean waves to RFR 2018-03-14 16:08:37 +05:30
Lethosor 7a333e312e
Merge pull request #1238 from BenLubar/develop-0.44.07-alpha1
Partial preparation for 0.44.07-alpha1.
2018-03-13 19:25:46 -04:00
Ben Lubar 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
Lethosor 464052fe52
Merge pull request #1237 from warmist/warmist-patch-1
Fix parse_inset in gui.lua
2018-03-11 12:11:24 -04:00
Warmist 25d2938477
Fix parse_inset in gui.lua
It was used in different order than the return happened.
2018-03-11 12:40:30 +02:00
lethosor ad57037711 Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop 2018-03-10 17:02:34 -05:00
lethosor d55048dfa1 Merge remote-tracking branch 'BenLubar/ubuntu-bionic' into develop 2018-03-10 16:57:07 -05:00
lethosor 0ccc89a5fe Make git-describe.cmake detect changes to itself 2018-03-10 16:55:20 -05:00
lethosor eb22d5c38e Add ABI version symbol to plugins 2018-03-10 16:55:00 -05:00
lethosor db95796d4c Many build fixes 2018-03-10 16:53:45 -05:00
lethosor f2ff609e1c Initial 0.44.06 support, update xml 2018-03-10 16:18:15 -05:00
Japa a810960bde Support spiderwebs and add a fake flow type for campfires. 2018-03-10 21:02:28 +05:30
Ben Lubar c260996d61
Update required CMake version 2018-03-08 12:26:10 -06:00
Ben Lubar 7bbfd456d3
Fix compile errors on Ubuntu 18.04 Bionic Beaver 2018-03-08 11:42:58 -06:00
Ben Lubar 4ca12621a2
Remove remaining CMP0022 usage 2018-03-08 11:38:46 -06:00
Ben Lubar acd4adc7cc
Fix CMake warning about CMP0022 policy being set as "OLD". 2018-03-08 02:28:28 -06:00
Japa 3e7da4d5f2 FIx wrong material being sent with item flows. 2018-03-06 22:37:26 +05:30
Japa c3f931652d Send item cloud info properly. 2018-03-06 09:44:21 +05:30
Japa c765e12254 Store tool names in RFR 2018-03-05 19:00:18 +05:30
Japa Mala Illo ebf9651896 Include Materials in flows. 2018-03-04 02:41:40 +05:30
Japa Mala Illo 894f6c232b actually copy flows with the block this time. 2018-03-03 12:48:09 +05:30
Japa Mala Illo 3f26d4fe09 Add flows to RFR 2018-03-03 11:41:58 +05:30
PatrikLundell ef24da0cd3 Key references on overlay as well 2018-02-27 21:06:07 +01:00
Japa 490fbd8b26 send instrument description using UTF8 2018-02-27 21:18:15 +05:30
Japa 65e549848d fix some crashes in the new instrument reader code. 2018-02-27 21:01:38 +05:30
Japa d758104f5e update stonesense for RFR protos 2018-02-27 20:24:32 +05:30
Japa 265e229d61 Send all relavent generated instruement information over RFR 2018-02-27 19:58:07 +05:30
PatrikLundell 578d6666eb Addressed request. Improved profile saving 2018-02-27 10:46:06 +01:00
PatrikLundell 7705eada5a Added magma/candy search + profile save/load. 2018-02-26 18:31:33 +01:00
PatrikLundell 2277c4ee4e Corrected reanimation detection 2018-02-25 10:28:38 +01:00
lethosor 0e7ab27850 Bump to r2, update changelog, update submdules 2018-02-21 23:07:53 -05:00
Lethosor 800dde360d
Merge pull request #1223 from JapaMala/remote_control
Remote control
2018-02-21 23:04:53 -05:00
Lethosor 171095aea0
Merge pull request #1230 from BenLubar/labormanager-pond
Fix labormanager never assigning dwarves to fill ponds
2018-02-21 23:02:08 -05:00
Ben Lubar 9f9d90c2ef
Fix labormanager never assigning dwarves to fill ponds, making irrigation very difficult. 2018-02-21 18:46:21 -06:00
Japa 778a1667dc ...also do it for images. 2018-02-21 22:31:39 +05:30
Japa 8c20d178b5 Include plant type with plant items. 2018-02-21 22:27:04 +05:30
Japa 1c97f58340 Merge remote-tracking branch 'DFHack/develop' into remote_control 2018-02-21 21:29:58 +05:30
lethosor 6e3b29930d Avoid crash in dwarfvet due to negative width/height
Partial fix for #1227
2018-02-16 15:12:46 -05:00
lethosor 7758fb6df5 dwarfvet: fix another log message, misc readability improvements 2018-02-16 02:32:53 -05:00
lethosor 988ce9c30d Update xml 2018-02-16 02:19:30 -05:00
lethosor 8779168c96 DFHACK_PLUGIN: qualify Plugin 2018-02-16 02:17:58 -05:00
lethosor 36f4954182 Update Stonesense and build docs (fixed Allegro download) 2018-02-16 02:16:06 -05:00
lethosor 94b2ca68d8 dwarfvet: fix extra % in log message
Mentioned in #1227
2018-02-13 11:19:10 -05:00
Japa e20872a7e9 Merge remote-tracking branch 'origin/remote_control' into remote_control 2018-02-13 21:30:16 +05:30