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 |
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 |
|
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 |
|
Japa
|
60e9839f63
|
Merge remote-tracking branch 'DFHack/develop' into remote_control
|
2018-02-13 21:29:09 +05:30 |
|
Japa
|
74bf06c69e
|
Do some checks before trying to read json files.
|
2018-02-13 20:02:42 +05:30 |
|
Japa
|
18cf70a543
|
Update Stonesense.
|
2018-02-13 12:37:45 +05:30 |
|
Japa
|
8c13ce4da3
|
update xmls
|
2018-02-13 12:36:00 +05:30 |
|
Japa
|
5dc89fee38
|
Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe
|
2018-02-13 12:26:36 +05:30 |
|
Japa
|
b3992229ad
|
update scripts.
|
2018-02-13 12:26:13 +05:30 |
|
Japa
|
6a516d7034
|
Merge remote-tracking branch 'DFHack/develop' into remote_control
|
2018-02-13 11:33:54 +05:30 |
|
lethosor
|
2f8fbd7ecd
|
Show warning if all plugins fail to load (e.g. on Windows XP)
|
2018-02-12 13:58:55 -05:00 |
|
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
|
23d02a642d
|
Make tweak pausing-fps-counter non-default for now
Ref #1219
|
2018-02-12 01:48:09 -05:00 |
|
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
|
269d575267
|
Document environment variables
|
2018-02-11 03:07:25 -05:00 |
|
lethosor
|
c136bcbaba
|
Update NEWS
|
2018-02-11 02:47:41 -05:00 |
|
lethosor
|
b2fb696473
|
Update scripts
|
2018-02-11 02:38:50 -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
|
9fe9e64f09
|
Add dtimm to Authors.rst (#1180)
|
2018-02-10 03:04:40 -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
|
19b65c2d1e
|
Remove Error.h include (#1224)
|
2018-02-07 20:14:36 -05:00 |
|
lethosor
|
65eb0e5fbd
|
Merge remote-tracking branch 'BenLubar/msvc-error' into develop
|
2018-02-07 20:08:51 -05:00 |