Commit Graph

6051 Commits (e73a2f8778d9b07db63c9d9a98351bce2134b644)
 

Author SHA1 Message Date
Lethosor 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
James Logsdon f8d8baef39 Remove explicit tokens and use ENUM_KEY_STR for profession templates 2015-03-25 15:04:52 -04:00
Lethosor 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
Ben Lubar d182b6c1c3 only create the stocksettings directory when it is requested 2015-03-24 17:46:49 -05:00
lethosor 5c877e4012 Clarify trailing whitespace logic 2015-03-24 16:08:33 -04:00
lethosor a5b2b92b30 Merge remote-tracking branch 'eswald/stockflow' into develop 2015-03-24 16:05:48 -04:00
lethosor ff38a60d56 Merge remote-tracking branch 'lethosor/ui-tweaks' into develop 2015-03-24 15:53:36 -04:00
expwnent 4fac0aff0d Fix compile: missing include in plugins/manipulator.cpp. 2015-03-24 12:25:50 -04:00
expwnent 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
expwnent 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
Eric Wald ebb3dc48bf Allowing whitespace-only lines. 2015-03-22 20:46:46 -06:00
Lethosor bf95e14358 Update NEWS 2015-03-22 16:43:44 -04:00
Lethosor 874e8d3104 Update NEWS 2015-03-22 16:39:15 -04:00
lethosor fb7837db0e Merge branch 'osx-libstdc++-10.5' into develop 2015-03-22 15:03:14 -04:00
lethosor 02cb510d20 Build OS X libstdc++ with -mmacosx-version-min=10.5
Fixes #561
2015-03-22 15:01:13 -04:00
lethosor 38fa416ad1 Lua: Indent array values 2015-03-22 14:04:03 -04:00
scamtank 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
Eric Wald 4f963233f4 Enticing the bookkeeper to work more often 2015-03-20 19:23:04 -06:00
lethosor d382d94cbc Use git:// url in .gitmodules 2015-03-20 20:26:24 -04:00
lethosor caff9ae741 Update LICENSE 2015-03-20 20:25:27 -04:00
lethosor 96e5c5d2fd Fix whitespace 2015-03-20 19:55:32 -04:00
lethosor b976053be0 Add Lua JSON library 2015-03-20 19:51:24 -04:00
lethosor f3508f82c1 Add jsonxx to depends/ 2015-03-20 15:45:38 -04:00
lethosor 625be319c9 Re-enable memory range logging on OS X if an environment variable is set 2015-03-19 19:37:10 -04:00
James Logsdon caed509d0b Simply maniuplator professions by adding the text token to the SkillColumn entries 2015-03-19 03:30:03 -04:00
lethosor 51a6d88c5c Merge branch 'travis-ruby' into develop 2015-03-16 16:09:57 -04:00
lethosor be89db5bad Implement ruby syntax checks 2015-03-15 23:29:08 -04:00
Lethosor c9f990b97f Add melkor217 to Contributors.rst 2015-03-15 21:44:58 -04:00
Eric Wald 23707db1d3 Fixed ballistic arrow head orders 2015-03-15 16:38:59 -06:00
Eric Wald 6bfaa8d35d Better way to handle obsolete job types. 2015-03-15 16:37:35 -06:00
Eric Wald 81c2a6e79f Refactoring a table insert into reaction_entry. 2015-03-15 16:02:29 -06:00
Eric Wald 11d65b4f2d Always clear reactions when loading.
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
Eric Wald d18bd3e2a5 Preventing a stockflow error message in Arena mode 2015-03-15 14:08:47 -06:00
Lethosor 3639920a50 Merge pull request #575 from lethosor/game-type
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
Lethosor 48b7c51027 Merge pull request #574 from melkor217/master
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
lethosor c8200abffb Update NEWS (separate some Lua-related changes) 2015-03-10 16:35:24 -04:00
lethosor e28aabaaa0 Merge branch 'lua-strerror' into develop 2015-03-10 16:33:07 -04:00
lethosor 016f67e83f Expose strerror to Lua 2015-03-10 16:32:43 -04:00
lethosor 0c5b5c691a Use gametype checks in plugins 2015-03-09 20:17:18 -04:00
lethosor afca7419dc Add gametype checks to World.cpp 2015-03-09 20:08:21 -04:00
Lethosor d07e1b6816 Update Contributing.rst 2015-03-08 11:47:23 -04:00
Lethosor 8c32951915 Add "tweak shift-8-scroll" to dfhack.init-example 2015-03-07 21:10:33 -05:00
lethosor 1591e67bf2 Replace backslashes with forward slashes in command names 2015-03-06 16:53:57 -05:00
Lethosor cb0bb4ecbd Update NEWS 2015-03-06 15:41:00 -05:00
lethosor 7abe70feb8 Update clsocket 2015-03-05 17:22:21 -05:00
lethosor c2eba99cb9 Create professions folder if necessary 2015-03-05 16:57:58 -05:00
lethosor efa9224eef Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop 2015-03-05 16:55:30 -05:00
lethosor 6f276ac419 Shorten option width to stay within 80 columns 2015-03-05 16:48:11 -05:00
Daniil Guzanov 4c06e022a6 Negative autolabor pool size uses most unskilled dwarves. 2015-03-06 00:47:18 +03:00
lethosor be2349d67d Revert "Expose manipulator columns to Lua"
This reverts commit 1d8b2d8cea.
2015-03-05 16:32:57 -05:00