lethosor
|
996306560b
|
Merge remote-tracking branches 'ab9rf/digtype-1243' and 'ab9rf/labormanager-map-check-bug' into develop
|
2018-04-02 00:56:33 -04:00 |
Kelly Kinkade
|
b8de7d4cf8
|
check for tile material == MINERAL in digtype (#1243)
|
2018-03-20 01:44:10 -05:00 |
|
Kelly Kinkade
|
81c9c8cdfe
|
Avoid crashing labormanager if map square on lowest level is designated+hidden (#1240)
|
2018-03-20 00:55:17 -05:00 |
|
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 |
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
|
ad57037711
|
Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop
|
2018-03-10 17:02:34 -05:00 |
|
lethosor
|
db95796d4c
|
Many build fixes
|
2018-03-10 16:53:45 -05:00 |
|
Japa
|
a810960bde
|
Support spiderwebs and add a fake flow type for campfires.
|
2018-03-10 21:02:28 +05:30 |
|
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
|
800dde360d
|
Merge pull request #1223 from JapaMala/remote_control
Remote control
|
2018-02-21 23:04:53 -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
|
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
|
60e9839f63
|
Merge remote-tracking branch 'DFHack/develop' into remote_control
|
2018-02-13 21:29:09 +05:30 |
|
Japa
|
18cf70a543
|
Update Stonesense.
|
2018-02-13 12:37:45 +05:30 |
|
Japa
|
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 |
|
lethosor
|
3a122d7391
|
Merge remote-tracking branch 'danamlund/better-fps-counter' into develop
|
2018-02-12 01:21:14 -05:00 |
|
lethosor
|
6260062d05
|
Add basic embark-assistant docs (closes #1226)
|
2018-02-11 03:08:02 -05:00 |
|
lethosor
|
ca29cb8e6f
|
embark-assistant: update field names, now compiles
|
2018-02-10 17:51:02 -05:00 |
|
lethosor
|
ef3adbe816
|
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
|
2018-02-10 17:27:13 -05:00 |
|
lethosor
|
9a0befa4cb
|
Show number of trees skipped
|
2018-02-10 03:03:07 -05:00 |
|
lethosor
|
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 |
|
lethosor
|
6a758c70a8
|
Merge remote-tracking branch 'dtimm/develop' into develop
|
2018-02-10 01:47:06 -05:00 |
|
lethosor
|
55f5439ddf
|
dwarfmonitor: remove unused hook, use CoreSuspendClaimer
|
2018-02-09 02:07:08 -05:00 |
|
Lethosor
|
6d33069fe9
|
Fix more copy-paste errors
|
2018-02-05 10:41:36 -05:00 |