Lethosor
|
54b0d2fcb6
|
Merge pull request #1154 from JapaMala/master
RemoteFortressReader updates.
|
2017-08-22 10:48:47 -04:00 |
lethosor
|
a39efc6f1d
|
Merge branch 'develop' of gh:dfhack/dfhack into develop
|
2017-08-21 19:35:14 -04:00 |
|
lethosor
|
4f38260e8c
|
Pass the correct architecture to setarch on Linux
Fixes #1129
|
2017-08-21 19:34:46 -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 |
|
Lethosor
|
a39672fc15
|
Merge pull request #1150 from DFHack/luasock-fix
Fix luasocket receive with byte count
|
2017-08-12 08:51:31 -04:00 |
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
|
9d4c7af11c
|
Merge branch 'develop' of gh:dfhack/dfhack into develop
|
2017-08-08 20:09:10 -04:00 |
|
lethosor
|
08656a3ca7
|
Strip DF folder from Ruby script paths
Fixes #1146 (temporarily, see #1147)
|
2017-08-08 20:08:07 -04:00 |
|
Lethosor
|
d99e3689fa
|
Merge pull request #1148 from ab9rf/fix-msvc
Fix a couple MSVC warnings
|
2017-08-07 18:36:38 -04:00 |
Kelly Kinkade
|
0b26e9aec7
|
Fix a couple of MSVC warnings
Use intptr_t instead of long for a handle, and add an explict cast to
eliminate a narrowing conversion warning
|
2017-08-07 14:13:22 -05:00 |
|
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
|
5c33fcccbd
|
Merge remote-tracking branch 'BenLubar/win64-warnings' into develop
|
2017-08-07 13:51:18 -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 |
|
lethosor
|
16fb230ef6
|
getAnyItem: support viewscreen_textviewerst
|
2017-08-05 21:38:18 -04:00 |
|
lethosor
|
d280863bc8
|
Avoid iterating over "has-bad-pointers" fields of IDTYPE_STRUCT and others
dfhack/df-structures@4c224dd205
|
2017-08-05 21:34:16 -04: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 |
|
Kelly Kinkade
|
fe9454ff1c
|
Fix #1103: do not idle for a meeting if the other participant is dead, asleep, resting, or on military duty
|
2017-07-29 09:26:19 -05:00 |
|
Kelly Kinkade
|
c5c80d5dc0
|
Rename labormanager_joblabormapper to joblabormapper
|
2017-07-28 23:03:23 -05:00 |
|
Kelly Kinkade
|
d810faa4a3
|
whitespace
|
2017-07-28 02:43:32 -05:00 |
|
Kelly Kinkade
|
a7d21fd627
|
move labormanager into a subdirectory
|
2017-07-28 02:28:16 -05:00 |
|
Japa
|
8ae7a1235d
|
Add rider ID to creatures
|
2017-07-27 18:41:46 +05:30 |
|
Japa
|
92a962a9c0
|
Send grass levels over RemoteFortressReader
|
2017-07-25 08:31:02 +05:30 |
|
Kelly Kinkade
|
fd19935fe9
|
labormanager: remove stupid
|
2017-07-22 04:54:05 -05:00 |
|
Kelly Kinkade
|
15ae72edec
|
labormanager: Refactor source, separating the job labor mapper into a separate source file.
|
2017-07-22 04:31:30 -05:00 |
Ben Lubar
|
17a7885ef2
|
Fix a bunch of 64-bit Windows warnings
|
2017-07-21 13:30:05 -05:00 |
|
Lethosor
|
9ba459f21e
|
Merge pull request #1134 from BenLubar/clsocket-windows-warnings
Update clsocket submodule. See DFHack/clsocket#10.
|
2017-07-21 12:07:24 -04:00 |
|
Ben Lubar
|
ac1d6f947f
|
Update clsocket submodule. See DFHack/clsocket#10.
|
2017-07-21 10:24:00 -05:00 |
|
Lethosor
|
4e55c4c916
|
Merge pull request #1133 from ab9rf/labormanager-1101
exclude on-duty military personnel from health labor check
|
2017-07-20 11:13:44 -04:00 |
|
Kelly Kinkade
|
90dd9e932e
|
exclude on-duty military personnel from health labor check
|
2017-07-20 03:54:00 -05:00 |
|
Japa Illo
|
1ee5debfba
|
Send the existence of all buildings on the map.
|
2017-07-17 15:29:23 +05:30 |
|
lethosor
|
15ed1bfd67
|
stl_vsprintf: avoid truncating 4096-byte strings
|
2017-07-13 13:08:27 -04:00 |
|
lethosor
|
ce1158780f
|
Fix crash in stl_vsprintf() from reusing va_list
|
2017-07-13 13:07:58 -04:00 |
|
lethosor
|
48a61420b7
|
Bump version
|
2017-07-12 19:06:37 -04:00 |
|
lethosor
|
e20ddb7f1d
|
Update NEWS, document orders
|
2017-07-12 19:00:24 -04:00 |
|
lethosor
|
c5fad31a4c
|
Fix indentation
|
2017-07-12 16:55:50 -04:00 |
|
lethosor
|
bdc746f3f1
|
Replace broken include guard
|
2017-07-12 16:53:09 -04:00 |