82202efb26
Don't reset disabled labors
...
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
0849099f20
Fix contributing merge errors.
2015-03-30 12:44:57 -04:00
f9b431b54d
Version bump and update NEWS.
2015-03-30 12:38:56 -04:00
be75883ac5
Update HTML.
2015-03-30 12:27:00 -04:00
6779849bc6
This requires a return value in Windows, and really should have one anyway.
2015-03-29 14:21:59 -04:00
b8f621f72d
Merge pull request #590 from BenLubar/ban-cooking
...
ban-cooking script
2015-03-28 16:00:29 -04:00
e657a05ca1
ban-cooking script
...
ban-cooking booze - bans cooking of drinks
ban-cooking honey - bans cooking of honey bee honey
ban-cooking tallow - bans cooking of tallow
ban-cooking oil - bans cooking of oil
ban-cooking seeds - bans cooking of plants that have seeds (tree seeds
don't count)
2015-03-28 13:09:35 -05:00
ac2f537bf4
Merge branch 'async-zoom' into develop
2015-03-26 19:41:02 -04:00
88c3a629d5
Fix vshook
2015-03-26 19:27:22 -04:00
ee16c6d1ab
Fix "delete" in console on OS X/Linux
2015-03-25 23:31:23 -04:00
7f98a632ce
Update xml
2015-03-25 17:58:00 -04:00
01c6d05775
Add custom enabler::zoom_display() method (screen.zoom in Lua)
2015-03-25 17:55:56 -04:00
42e4f584b9
Add SDL_SemWait and SDL_SemPost hooks
2015-03-25 16:08:25 -04:00
e8ff7ff97a
Merge pull request #586 from jlogsdon/fix/manipulator-enum-key
...
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:24:53 -04:00
f8d8baef39
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:04:52 -04:00
b94dd447cf
Merge pull request #585 from BenLubar/fix/stockpiles-directory
...
plugins/stockpiles: only create the stocksettings directory when it is requested
2015-03-24 21:15:21 -04:00
d182b6c1c3
only create the stocksettings directory when it is requested
2015-03-24 17:46:49 -05:00
5c877e4012
Clarify trailing whitespace logic
2015-03-24 16:08:33 -04:00
a5b2b92b30
Merge remote-tracking branch 'eswald/stockflow' into develop
2015-03-24 16:05:48 -04:00
ff38a60d56
Merge remote-tracking branch 'lethosor/ui-tweaks' into develop
2015-03-24 15:53:36 -04:00
4fac0aff0d
Fix compile: missing include in plugins/manipulator.cpp.
2015-03-24 12:25:50 -04:00
eeb73462e5
Merge branch 'fix/manipulator-professions' of https://github.com/jlogsdon/dfhack into jlogsdon-fix/manipulator-professions
2015-03-24 07:39:07 -04:00
c8495a0a35
Merge pull request #582 from scamtank/patch-1
...
Extend fix/blood-del to include tears and sweat
2015-03-24 07:28:23 -04:00
ebb3dc48bf
Allowing whitespace-only lines.
2015-03-22 20:46:46 -06:00
bf95e14358
Update NEWS
2015-03-22 16:43:44 -04:00
874e8d3104
Update NEWS
2015-03-22 16:39:15 -04:00
fb7837db0e
Merge branch 'osx-libstdc++-10.5' into develop
2015-03-22 15:03:14 -04:00
02cb510d20
Build OS X libstdc++ with -mmacosx-version-min=10.5
...
Fixes #561
2015-03-22 15:01:13 -04:00
9a661e1481
Extend fix/blood-del to include tears and sweat
...
This version of blood-del.lua will catch the new bodily emissions too, mostly from gremlins or gnomes.
2015-03-22 14:24:51 +02:00
4f963233f4
Enticing the bookkeeper to work more often
2015-03-20 19:23:04 -06:00
625be319c9
Re-enable memory range logging on OS X if an environment variable is set
2015-03-19 19:37:10 -04:00
caed509d0b
Simply maniuplator professions by adding the text token to the SkillColumn entries
2015-03-19 03:30:03 -04:00
51a6d88c5c
Merge branch 'travis-ruby' into develop
2015-03-16 16:09:57 -04:00
be89db5bad
Implement ruby syntax checks
2015-03-15 23:29:08 -04:00
c9f990b97f
Add melkor217 to Contributors.rst
2015-03-15 21:44:58 -04:00
23707db1d3
Fixed ballistic arrow head orders
2015-03-15 16:38:59 -06:00
6bfaa8d35d
Better way to handle obsolete job types.
2015-03-15 16:37:35 -06:00
81c2a6e79f
Refactoring a table insert into reaction_entry.
2015-03-15 16:02:29 -06:00
11d65b4f2d
Always clear reactions when loading.
...
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
d18bd3e2a5
Preventing a stockflow error message in Arena mode
2015-03-15 14:08:47 -06:00
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
48b7c51027
Merge pull request #574 from melkor217/master
...
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
c8200abffb
Update NEWS (separate some Lua-related changes)
2015-03-10 16:35:24 -04:00
e28aabaaa0
Merge branch 'lua-strerror' into develop
2015-03-10 16:33:07 -04:00
016f67e83f
Expose strerror to Lua
2015-03-10 16:32:43 -04:00
0c5b5c691a
Use gametype checks in plugins
2015-03-09 20:17:18 -04:00
afca7419dc
Add gametype checks to World.cpp
2015-03-09 20:08:21 -04:00
d07e1b6816
Update Contributing.rst
2015-03-08 11:47:23 -04:00
8c32951915
Add "tweak shift-8-scroll" to dfhack.init-example
2015-03-07 21:10:33 -05:00
1591e67bf2
Replace backslashes with forward slashes in command names
2015-03-06 16:53:57 -05:00
Ross Morgan-Linial
expwnent
Lethosor
Ben Lubar
lethosor
James Logsdon
Eric Wald
scamtank