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 |
Ben Lubar
|
acd4adc7cc
|
Fix CMake warning about CMP0022 policy being set as "OLD".
|
2018-03-08 02:28:28 -06: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 |
|
Japa
|
7f8ea9e82c
|
Merge remote-tracking branch 'DFHack/develop' into remote_control
|
2018-02-05 20:11:55 +05:30 |
|
Japa
|
9a032ac447
|
I'm a moron.
|
2018-02-05 20:11:47 +05:30 |
|
lethosor
|
b2a19dedeb
|
load-art-image-chunk: safety check
|
2018-02-04 22:56:24 -05:00 |
|
Japa
|
78061085c6
|
Add art image properties to RFR
|
2018-02-04 16:02:02 +05:30 |
|
Japa
|
60c1bd3c66
|
Merge remote-tracking branch 'refs/remotes/DFHack/develop'
Conflicts:
library/xml
|
2018-02-04 10:26:39 +05:30 |
|
Japa
|
ed406e0e3d
|
fix naming and return statement.
|
2018-02-04 10:24:51 +05:30 |
|
Japa
|
c621a29fe3
|
Fix global name.
|
2018-02-04 10:21:28 +05:30 |
|
Japa
|
38140fb450
|
Copy engravings in RFR, and update the art image function.
|
2018-02-04 10:12:15 +05:30 |
|
lethosor
|
bdba95f90c
|
memview: check for tags from sizecheck
|
2018-02-03 18:10:16 -05:00 |
Dan Amlund
|
6181b2bce3
|
Add tweak that replaces dwarf mode FPS counter with one that does not count when paused
|
2018-02-03 17:58:24 +01:00 |
|
Japa
|
8665600574
|
Send tiles for shape descriptors, and art image ids.
|
2018-02-03 10:38:17 +05:30 |
|
Japa
|
e63a871363
|
use the vmethod for getting improvement images.
|
2018-01-31 10:11:43 +05:30 |
|
Japa
|
9aaeecb4d6
|
Merge remote-tracking branch 'DFHack/develop' into remote_control
|
2018-01-28 13:41:52 +05:30 |
|
lethosor
|
788a48144b
|
dig: fix issues with priority parameters and digvx/diglx
|
2018-01-28 02:16:57 -05:00 |
|
Japa
|
b78b2feed2
|
Remove extra whitespace.
|
2018-01-28 10:12:50 +05:30 |
|
Japa
|
ca3b2b30b3
|
fix compiling on gcc.
|
2018-01-27 19:26:30 +05:30 |
|
Japa
|
341c0dacf3
|
updated function definition for win64.
|
2018-01-27 12:44:51 +05:30 |
|
Japa
|
aff9c22875
|
update submodules.
|
2018-01-26 08:27:03 +05:30 |
|
Japa
|
e3d95daf45
|
Don't use globals
|
2018-01-26 08:19:41 +05:30 |
|
lethosor
|
5e0e674580
|
Update submodules
|
2018-01-25 10:56:08 -05:00 |
|
Japa
|
ef451a2f2d
|
Got the image reader function working.
|
2018-01-25 20:24:12 +05:30 |
|
Japa
|
f1b8fa305b
|
try using the new function pointer.
|
2018-01-25 11:55:46 +05:30 |
|
Japa
|
68324dfe0b
|
Send statue images.
|
2018-01-25 07:53:19 +05:30 |
|
Japa
|
ee7ad348f0
|
add item images
|
2018-01-24 12:09:05 +05:30 |
|
Japa
|
42bbe124b7
|
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
|
2018-01-24 10:24:23 +05:30 |
|
Japa
|
f75b116ae2
|
Added the rest of the relavent improvement headers.
|
2018-01-24 10:22:45 +05:30 |