Commit Graph

7270 Commits (ef569dc5a1521af1eba5e586d6d3e9ad0149d3b9)
 

Author SHA1 Message Date
expwnent 448404a465 Fix buildingplan stuff on Windows. 2015-01-05 20:02:54 -05:00
expwnent 1519d8e9ea Disable fortplan and buildingplan for now because it doesn't compile on Windows. 2015-01-05 19:34:01 -05:00
expwnent 7e11ad821f Update xml. 2015-01-05 19:33:39 -05:00
lethosor cd64fb84b7 Make fortplan use Filesystem::getcwd() 2015-01-05 17:37:41 -05:00
lethosor d932c76242 Fix MapCache compiling error on Windows 2015-01-05 17:28:42 -05:00
lethosor f4b75787be Update version in NEWS 2015-01-05 17:07:13 -05:00
lethosor 318fb5213a Update contributors list 2015-01-05 17:03:52 -05:00
lethosor 5de5d4420a Update xml 2015-01-05 17:01:03 -05:00
lethosor a28fde3f86 Run fixTexts.sh 2015-01-05 17:00:28 -05:00
lethosor f451cfb3a5 Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
Also update NEWS
2015-01-05 16:59:08 -05:00
lethosor 67f0aa774c Merge remote-tracking branch 'lethosor/tweaks-2'
Conflicts:
	NEWS
2015-01-05 16:54:24 -05:00
lethosor e9fd8cf231 Merge remote-tracking branch 'lethosor/embark-tools-mouse'
Also update NEWS
2015-01-05 16:53:06 -05:00
lethosor 182f317fcc Merge remote-tracking branch 'lethosor/plugload-posix' 2015-01-05 16:50:43 -05:00
lethosor 0cfe6a11a3 Merge remote-tracking branch 'eswald/alt-stuck'
Conflicts:
	NEWS
2015-01-05 16:50:16 -05:00
lethosor 8311534b83 Merge remote-tracking branch 'lethosor/patch-10' 2015-01-05 16:48:45 -05:00
lethosor 0c768796e2 Merge remote-tracking branch 'danaris/fortplan'
Conflicts:
	plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
lethosor 06029c92c2 Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9' 2015-01-05 16:40:44 -05:00
lethosor 57f6a94133 Merge remote-tracking branch 'lethosor/osx-libstdc++'
Also update NEWS
2015-01-05 16:39:42 -05:00
lethosor 7da9ab8f80 Merge remote-tracking branch 'lethosor/0.40.22-plugins'
Also update NEWS
2015-01-05 16:37:34 -05:00
lethosor 83142b9657 Merge remote-tracking branch 'PeridexisErrant/keybinding-defaults'
Also update NEWS
2015-01-05 16:34:14 -05:00
lethosor 3bc17dafab Merge remote-tracking branch 'PeridexisErrant/digfort-checks'
Conflicts:
	NEWS
2015-01-05 16:32:14 -05:00
lethosor 8f60e0eb01 Merge remote-tracking branches 'lethosor/remove-embark' and 'lethosor/revert-401-dfhack-log'
Also update NEWS
2015-01-05 16:31:03 -05:00
lethosor 2bc5fe26ee Update NEWS 2015-01-05 16:29:03 -05:00
lethosor 1d0b4deef6 Merge remote-tracking branch 'eswald/trackstop'
Conflicts:
	NEWS
2015-01-05 16:22:18 -05:00
lethosor ad6b19f1b2 Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
Conflicts:
	NEWS
2015-01-05 16:21:24 -05:00
lethosor f0e7d2b895 Merge remote-tracking branches 'warmist/advfort', 'Putnam3145/patch-8', 'AndreasPK/master' and 'PeridexisErrant/fix-exportlegends' 2015-01-05 16:19:52 -05:00
lethosor 6e36b224d1 Merge remote-tracking branch 'ramblurr/stockpiles'
Also update stockpiles plugin to use REQUIRE_GLOBAL()

Conflicts:
	plugins/stockpiles.cpp
2015-01-05 16:16:29 -05:00
lethosor ca0860c3bd Merge remote-tracking branch 'lethosor/plugin-globals' 2015-01-05 16:05:40 -05:00
lethosor 983f096a60 Merge remote-tracking branch 'quipyowert/define-maxlayers' into 0.40.23-r1 2015-01-05 16:04:37 -05:00
Matthew Townsend fba77a6dfd Bash script to build dfhack according to the instructions in Compile.rst.
Closes #410
2015-01-05 16:02:13 -05:00
lethosor 9f2bdc2bdc Disable excessive logging in Process-darwin.cpp 2015-01-05 15:58:02 -05:00
Chris Dombroski 929f63ee2e Fix error in WatchedRace::SortUnitsByAge 2015-01-05 15:57:34 -05:00
lethosor e7ee29b1e3 Clean up whitespace in Hooks-darwin.cpp 2015-01-05 15:57:34 -05:00
lethosor dd9cb70ad3 Update CMakeLists to 0.40.23-r1 2015-01-05 15:56:22 -05:00
Chris Dombroski c069a87b47 Update isGay(df::unit) with better determination 2015-01-05 14:59:32 -05:00
Chris Dombroski 1cdf61908e Collapse ProcessUnits_* methods. 2015-01-05 14:25:44 -05:00
Chris Dombroski 084bbc3162 Add isGay(df::unit*) method 2015-01-05 13:54:17 -05:00
Chris Dombroski 294fe0b30c Update siren.lua for emotions
Runs now without exception/error and adds emotions correctly. Seems to work as intended.
2015-01-05 08:33:10 -05:00
Eric Wald 9b429eb944 Update NEWS 2015-01-04 12:04:12 -07:00
Japa 5626bb8da7 layer and vein materials were being set wrong. 2015-01-04 19:05:48 +05:30
lethosor 4abcaf79ef Update readme 2015-01-02 15:52:45 -05:00
lethosor e054405718 Remove `embark` references from readme 2015-01-02 15:50:26 -05:00
PeridexisErrant b4f224fb3f minor console output tweaks
Also remove unused sample file from code, change handling of offset.
2015-01-02 22:01:48 +11:00
Lethosor cea32a335c Add `tweak max-wheelbarrow` to dfhack.init-example 2015-01-01 20:20:11 -05:00
lethosor cc22c034ab Update NEWS 2015-01-01 14:38:14 -05:00
lethosor 47d6e111c8 New tweak: "max-wheelbarrow" 2015-01-01 14:36:49 -05:00
lethosor ffac2f1795 New tweak: "eggs-fertile" 2015-01-01 13:48:11 -05:00
lethosor cade0d9723 Add local area mouse controls to embark-tools 2015-01-01 11:06:50 -05:00
Japa c373e57c02 Added world names. 2014-12-31 17:50:43 +05:30
lethosor e0a8cc8537 Merge PlugLoad-linux.cpp and PlugLoad-darwin.cpp 2014-12-29 10:33:54 -05:00