Commit Graph

7906 Commits (cf7dbd478aac33f23d752b9075cb9e0f6eb35885)
 

Author SHA1 Message Date
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
lethosor 018f3be70a Merge remote-tracking branch 'JapaMala/master' into develop 2017-07-12 16:52:30 -04:00
lethosor 4d9fe4f7c1 Merge remote-tracking branch 'BenLubar/plugin-orders' into develop 2017-07-12 16:50:40 -04:00
lethosor d236181cdc Merge remote-tracking branch 'BenLubar/repeat-util-cancel-self' into develop 2017-07-12 16:35:24 -04:00
lethosor 15a391c620 Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-07-12 16:31:45 -04:00
lethosor 3103d697d9 Add an onLoad.init-example file
Closes #1093
2017-07-12 16:30:49 -04:00
lethosor e3cd820fb1 Limit recursive runCommand() calls to 20
Addresses an issue with recursive aliases crashing (#701)
2017-07-12 16:28:21 -04:00
Lethosor 442af15c68 Merge pull request #1114 from BenLubar/dfhack-assert
Enable asserts in RelWithDebInfo builds
2017-07-11 16:26:08 -04:00
Ben Lubar f963d89e12 Merge branch 'develop' into plugin-orders 2017-07-11 15:12:40 -05:00
Ben Lubar 7fed961fcd
Make repeatUtil.cancel work even when called from the callback. Closes #1122. 2017-07-11 15:10:42 -05:00
lethosor 070dfa1865 Merge branch 'develop' of dfhack/dfhack into develop 2017-07-05 23:57:35 -04:00