Commit Graph

7112 Commits (ed81be16b3fa9c274dfcd3d53177fce81597b0e8)
 

Author SHA1 Message Date
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
Ben Lubar 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
Japa 7f3191352c send growth info through remotefortressreader.cpp 2016-01-28 00:06:10 +05:30
Japa 32e39b8b13 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-01-27 18:49:58 +05:30
Japa 4c4eda44f9 Added plant raw list to RemoteFortressReader.proto 2016-01-27 18:49:30 +05:30
James Gilles 61d4c9da9c Enable ycmd for project 2016-01-26 20:37:27 -05:00
lethosor 80ecbbd369 get rid of "private" comment in BitArray.h 2016-01-21 16:49:16 -05:00
Robert Janetzko 29ab4de8a6 export occasions and schedules 2016-01-21 22:28:13 +01:00
Lethosor 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
Ben Lubar a1d557c487 Add ban-cooking milk. See #795. 2016-01-18 15:29:49 -06:00
Ben Lubar 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
Lethosor 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
Ben Lubar 675d173266 set civzone number when constructing a civzone 2016-01-18 14:46:39 -06:00
lethosor 0b2ba377be Update xml 2016-01-18 11:49:37 -05:00
lethosor c78a1391e1 Update version to 0.42.05 2016-01-18 10:55:21 -05:00
lethosor 1498eae4b5 save-version: 0.42.05 (1537) 2016-01-18 10:40:12 -05:00
lethosor ab8cce2a86 Update xml 2016-01-18 10:13:16 -05:00
lethosor 71ff6f875a Also exclude libprotoc when cross-compiling (unused) 2016-01-18 09:22:08 -05:00
lethosor c15cf5f415 Rename libstdc++ automatically in Linux launcher script 2016-01-18 09:21:31 -05:00
lethosor 63e5b5bc0f Fix ZLIB_ROOT on Windows 2016-01-17 23:04:08 -05:00
Robert Janetzko 5ab2706b11 materials for masterpieces 2016-01-17 16:45:39 +01:00
lethosor a7b2d5e38f Fix autogems typedefs for MSVC and log errors to stderr 2016-01-16 11:45:04 -05:00
lethosor 514ae890be exportlegends-related documentation updates 2016-01-16 11:34:12 -05:00
lethosor 5f9817bdab Merge remote-tracking branch 'robertjanetzko/additional-exports' into develop 2016-01-16 11:22:10 -05:00
lethosor ba3731016b Only show prerelease warning once 2016-01-16 11:12:36 -05:00
lethosor 15a9d7f491 Fix whitespace 2016-01-14 20:13:46 -05:00
Robert Janetzko aab5996d7c export landmasses, mountains and entity claims 2016-01-12 18:48:14 +01:00
Robert Janetzko 45121ce3ad race for HIST_FIGURE_NEW_PET event 2016-01-12 16:47:44 +01:00
Robert Janetzko 8ad71aae62 export contents of scrolls and books 2016-01-12 14:59:13 +01:00
Robert Janetzko a0836ac7b7 export substates (45=fled, 46/47=moved to study) from CHANGE_HF_STATE
event
2016-01-12 14:14:46 +01:00