Commit Graph

7391 Commits (8d84b0d968bf1af5ecb36ad28376e197ee835ce2)
 

Author SHA1 Message Date
lethosor 25507a10f9 Add Units::getKillCount() and expose it to Lua 2016-02-25 15:21:14 -05:00
lethosor 3e44aabf12 Expose Units::getSquadName to lua 2016-02-25 15:19:35 -05:00
lethosor 297bbd6f20 Merge remote-tracking branch 'warmist/develop' into develop (closes #772) 2016-02-24 17:24:03 -05:00
lethosor 78a7d7a43b Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop 2016-02-24 16:36:57 -05:00
lethosor 9d0d4fd08b Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-02-24 16:34:29 -05:00
lethosor 79fde493e2 Merge remote-tracking branch 'eswald/autogems-bugfix' into develop 2016-02-24 16:33:54 -05:00
Lethosor d479f30592 Merge pull request #826 from eswald/stockflow-4206
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
Eric Wald 8ce115646a Updating Stockflow for version 42.06
The manager can now specify each type of craft individually, as well as in general.
There may be a better justification for not allowing pearl and shell scepters, though.
2016-02-23 22:09:26 -07:00
lethosor 6a9205eccc save-version: add 0.42.06 (1542) 2016-02-23 19:50:15 -05:00
sv-esk 20572fb667 add new jobs to autolabor 2016-02-23 19:01:14 +02:00
expwnent d1073a35d6 modtools/create-unit: checked for args.civId ~= -1 2016-02-20 19:00:47 -05:00
Japa 420eb5341b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-20 01:31:12 +05:30
Japa ac068b4738 Fixed DF color translation in remotefortressreader.cpp 2016-02-20 01:30:56 +05:30
Eric Wald 224d29de88 Reversing o-W-g autogems default setting
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
2016-02-13 21:01:26 -07:00
Eric Wald e160fec2b9 Ignoring forbidden rough gems 2016-02-13 20:59:08 -07:00
sv-esk d2450c34ff forbid manipulator editing ghosts
they are not flags1.dead
2016-02-12 13:47:58 +02:00
lethosor f4ce45deae Disable confirm note-delete in name entry
Fixes #820
2016-02-11 22:56:33 -05:00
sv-esk 83c70ccb0f forbid manipulator editing non-citizens 2016-02-11 13:31:52 +02:00
sv-esk ac070e49a4 forbid manipulator editing visitors 2016-02-11 06:24:18 +02:00
sv-esk 3cab865d58 fix manipulator racism
(allow editing non-dwarves)
2016-02-11 06:23:30 +02:00
sv-esk ff4b2f8522 add new skill columns 2016-02-11 06:23:21 +02:00
lethosor fafe1e9ce1 Update xml 2016-02-03 23:19:41 -05:00
James Gilles 5d8c2fd502 Fix whitespace 2016-02-02 01:14:04 -05:00
Warmist 3e402fa97c Remove left over handlers from eventful 2016-02-01 22:23:31 +02:00
Warmist e4ae1c11f5 Update eventful's produce hook to new vmethod. Also make all events use no-handler version thus removing lot of unused functions (and empty function calls). 2016-02-01 22:23:29 +02:00
Warmist d4988c5faf Add no handler version of lua event. 2016-02-01 22:22:12 +02:00
lethosor cfa66c0489 Fix whitespace 2016-02-01 11:38:28 -05:00
James Gilles 0a670bb0db Implement #804, move some functions to Units, colorize zone output, a
little cleanup
2016-02-01 11:12:06 -05:00
lethosor fbe076c5ef Bump version to 0.42.05-alpha1 2016-02-01 10:32:45 -05:00
lethosor a7234b9c53 Add a basic script to check for release sanity 2016-02-01 10:31:12 -05:00
lethosor 2d23a848cc git-describe: Add git xml information 2016-02-01 10:30:53 -05:00
lethosor a7d254139f Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-02-01 09:40:00 -05:00
lethosor 2556b319f0 Improve linter disabling somewhat 2016-02-01 09:39:40 -05:00
Japa 297f441bd6 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-01 20:01:00 +05:30
Japa 054954a72a Corrected the region details logic. 2016-02-01 20:00:25 +05:30
PeridexisErrant e519313b70 Convert colonies plugin to script, add place feature 2016-02-01 18:12:38 +11:00
PeridexisErrant 9a81fb1add Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-01 16:36:42 +11:00
Lethosor 91f85831a7 Merge pull request #809 from BenLubar/benlubar-floodgate-alloc-2
Add support for grates and bars to Ruby.
2016-01-31 16:26:56 -05:00
Ben Lubar afa1199f98 Add support for grates and bars to Ruby.
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
lethosor 881fd6bd8d Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-01-31 15:01:27 -05:00
lethosor 7d07164dcc Merge remote-tracking branch 'kazimuth/ycmd' into develop 2016-01-31 14:56:36 -05:00
Lethosor 80b48ca5da Merge pull request #800 from BenLubar/benlubar-valgrind
allow dfhack to run inside valgrind
2016-01-31 14:53:08 -05:00
lethosor 77466f01e0 Merge remote-tracking branch 'BenLubar/benlubar-valgrind' into develop 2016-01-31 14:52:04 -05:00
lethosor 248331a196 buildingplan: Support floodgates, grates, bars
See #808
2016-01-31 14:50:07 -05:00
Ben Lubar ea9261f5b5 allow dfhack to run inside valgrind
valgrind replaces the readlink system call, but not the open system
call. By calling readlink first, we guarantee that /proc/self/exe is the
actual Dwarf Fortress executable and not the valgrind executable.

See also: https://bugs.kde.org/show_bug.cgi?id=86921
2016-01-31 13:34:07 -06:00
lethosor 80fd2270db Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-01-31 14:22:57 -05:00
Lethosor d063155b87 Merge pull request #808 from BenLubar/benlubar-floodgate-alloc
Fix floodgate allocation in C++/Lua and well and pressure plate allocation in Ruby.
2016-01-31 14:20:46 -05:00
Japa e49745d338 Added tile and material to growths in remotefortressreader.cpp 2016-02-01 00:41:13 +05:30
Ben Lubar 197e5ca2d9 update the name of the pressure plate field in ruby
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L365-L371
2016-01-30 08:46:16 -06:00
Ben Lubar aab5c61923 set well bucket z correctly when allocating it in ruby
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L347-L352
2016-01-29 14:51:32 -06:00