9d0d4fd08b
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-02-24 16:34:29 -05:00
79fde493e2
Merge remote-tracking branch 'eswald/autogems-bugfix' into develop
2016-02-24 16:33:54 -05:00
d479f30592
Merge pull request #826 from eswald/stockflow-4206
...
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
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
6a9205eccc
save-version: add 0.42.06 (1542)
2016-02-23 19:50:15 -05:00
d1073a35d6
modtools/create-unit: checked for args.civId ~= -1
2016-02-20 19:00:47 -05:00
420eb5341b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-20 01:31:12 +05:30
ac068b4738
Fixed DF color translation in remotefortressreader.cpp
2016-02-20 01:30:56 +05:30
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
e160fec2b9
Ignoring forbidden rough gems
2016-02-13 20:59:08 -07:00
f4ce45deae
Disable confirm note-delete in name entry
...
Fixes #820
2016-02-11 22:56:33 -05:00
fafe1e9ce1
Update xml
2016-02-03 23:19:41 -05:00
cfa66c0489
Fix whitespace
2016-02-01 11:38:28 -05:00
fbe076c5ef
Bump version to 0.42.05-alpha1
2016-02-01 10:32:45 -05:00
a7234b9c53
Add a basic script to check for release sanity
2016-02-01 10:31:12 -05:00
2d23a848cc
git-describe: Add git xml information
2016-02-01 10:30:53 -05:00
a7d254139f
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-02-01 09:40:00 -05:00
2556b319f0
Improve linter disabling somewhat
2016-02-01 09:39:40 -05:00
297f441bd6
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-01 20:01:00 +05:30
054954a72a
Corrected the region details logic.
2016-02-01 20:00:25 +05:30
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
afa1199f98
Add support for grates and bars to Ruby.
...
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
881fd6bd8d
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-01-31 15:01:27 -05:00
7d07164dcc
Merge remote-tracking branch 'kazimuth/ycmd' into develop
2016-01-31 14:56:36 -05:00
80b48ca5da
Merge pull request #800 from BenLubar/benlubar-valgrind
...
allow dfhack to run inside valgrind
2016-01-31 14:53:08 -05:00
77466f01e0
Merge remote-tracking branch 'BenLubar/benlubar-valgrind' into develop
2016-01-31 14:52:04 -05:00
248331a196
buildingplan: Support floodgates, grates, bars
...
See #808
2016-01-31 14:50:07 -05:00
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
80fd2270db
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-01-31 14:22:57 -05:00
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
e49745d338
Added tile and material to growths in remotefortressreader.cpp
2016-02-01 00:41:13 +05:30
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
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
a316dfa074
set floodgate flags correctly when allocating it in lua or c++
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/plugins/ruby/building.rb#L63
2016-01-29 14:50:50 -06:00
7f3191352c
send growth info through remotefortressreader.cpp
2016-01-28 00:06:10 +05:30
32e39b8b13
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-01-27 18:49:58 +05:30
4c4eda44f9
Added plant raw list to RemoteFortressReader.proto
2016-01-27 18:49:30 +05:30
61d4c9da9c
Enable ycmd for project
2016-01-26 20:37:27 -05:00
80ecbbd369
get rid of "private" comment in BitArray.h
2016-01-21 16:49:16 -05:00
8e5cf8e683
Merge pull request #799 from BenLubar/benlubar-796
...
Add brew, mill, thread, and milk to ban-cooking. See #796 and #795 .
2016-01-21 16:04:43 -05:00
a1d557c487
Add ban-cooking milk. See #795 .
2016-01-18 15:29:49 -06:00
d36bb20d91
Add brew, mill, and thread to ban-cooking. See #796 .
...
brew: bans cooking of plants and fruits that can be made into alcohol
(assuming default brewing reaction)
mill: bans cooking of plants that can be milled.
thread: bans cooking of plants that can be turned into thread.
2016-01-18 15:07:09 -06:00
f61ff9147e
Merge pull request #798 from BenLubar/benlubar-civzone-num
...
set civzone number when constructing a civzone
2016-01-18 15:55:17 -05:00
675d173266
set civzone number when constructing a civzone
2016-01-18 14:46:39 -06:00
0b2ba377be
Update xml
2016-01-18 11:49:37 -05:00
c78a1391e1
Update version to 0.42.05
2016-01-18 10:55:21 -05:00
1498eae4b5
save-version: 0.42.05 (1537)
2016-01-18 10:40:12 -05:00
ab8cce2a86
Update xml
2016-01-18 10:13:16 -05:00
71ff6f875a
Also exclude libprotoc when cross-compiling (unused)
2016-01-18 09:22:08 -05:00
c15cf5f415
Rename libstdc++ automatically in Linux launcher script
2016-01-18 09:21:31 -05:00
lethosor
Lethosor
Eric Wald
expwnent
Japa
Ben Lubar
James Gilles