318fb5213a
Update contributors list
2015-01-05 17:03:52 -05:00
5de5d4420a
Update xml
2015-01-05 17:01:03 -05:00
a28fde3f86
Run fixTexts.sh
2015-01-05 17:00:28 -05:00
f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
67f0aa774c
Merge remote-tracking branch 'lethosor/tweaks-2'
...
Conflicts:
NEWS
2015-01-05 16:54:24 -05:00
e9fd8cf231
Merge remote-tracking branch 'lethosor/embark-tools-mouse'
...
Also update NEWS
2015-01-05 16:53:06 -05:00
182f317fcc
Merge remote-tracking branch 'lethosor/plugload-posix'
2015-01-05 16:50:43 -05:00
0cfe6a11a3
Merge remote-tracking branch 'eswald/alt-stuck'
...
Conflicts:
NEWS
2015-01-05 16:50:16 -05:00
8311534b83
Merge remote-tracking branch 'lethosor/patch-10'
2015-01-05 16:48:45 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
06029c92c2
Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9'
2015-01-05 16:40:44 -05:00
57f6a94133
Merge remote-tracking branch 'lethosor/osx-libstdc++'
...
Also update NEWS
2015-01-05 16:39:42 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
83142b9657
Merge remote-tracking branch 'PeridexisErrant/keybinding-defaults'
...
Also update NEWS
2015-01-05 16:34:14 -05:00
3bc17dafab
Merge remote-tracking branch 'PeridexisErrant/digfort-checks'
...
Conflicts:
NEWS
2015-01-05 16:32:14 -05:00
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
2bc5fe26ee
Update NEWS
2015-01-05 16:29:03 -05:00
1d0b4deef6
Merge remote-tracking branch 'eswald/trackstop'
...
Conflicts:
NEWS
2015-01-05 16:22:18 -05:00
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
f0e7d2b895
Merge remote-tracking branches 'warmist/advfort', 'Putnam3145/patch-8', 'AndreasPK/master' and 'PeridexisErrant/fix-exportlegends'
2015-01-05 16:19:52 -05:00
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
ca0860c3bd
Merge remote-tracking branch 'lethosor/plugin-globals'
2015-01-05 16:05:40 -05:00
983f096a60
Merge remote-tracking branch 'quipyowert/define-maxlayers' into 0.40.23-r1
2015-01-05 16:04:37 -05:00
fba77a6dfd
Bash script to build dfhack according to the instructions in Compile.rst.
...
Closes #410
2015-01-05 16:02:13 -05:00
9f2bdc2bdc
Disable excessive logging in Process-darwin.cpp
2015-01-05 15:58:02 -05:00
929f63ee2e
Fix error in WatchedRace::SortUnitsByAge
2015-01-05 15:57:34 -05:00
e7ee29b1e3
Clean up whitespace in Hooks-darwin.cpp
2015-01-05 15:57:34 -05:00
dd9cb70ad3
Update CMakeLists to 0.40.23-r1
2015-01-05 15:56:22 -05:00
c069a87b47
Update isGay(df::unit) with better determination
2015-01-05 14:59:32 -05:00
1cdf61908e
Collapse ProcessUnits_* methods.
2015-01-05 14:25:44 -05:00
084bbc3162
Add isGay(df::unit*) method
2015-01-05 13:54:17 -05:00
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
9b429eb944
Update NEWS
2015-01-04 12:04:12 -07:00
5626bb8da7
layer and vein materials were being set wrong.
2015-01-04 19:05:48 +05:30
4abcaf79ef
Update readme
2015-01-02 15:52:45 -05:00
e054405718
Remove `embark` references from readme
2015-01-02 15:50:26 -05:00
b4f224fb3f
minor console output tweaks
...
Also remove unused sample file from code, change handling of offset.
2015-01-02 22:01:48 +11:00
cea32a335c
Add `tweak max-wheelbarrow` to dfhack.init-example
2015-01-01 20:20:11 -05:00
cc22c034ab
Update NEWS
2015-01-01 14:38:14 -05:00
47d6e111c8
New tweak: "max-wheelbarrow"
2015-01-01 14:36:49 -05:00
ffac2f1795
New tweak: "eggs-fertile"
2015-01-01 13:48:11 -05:00
cade0d9723
Add local area mouse controls to embark-tools
2015-01-01 11:06:50 -05:00
c373e57c02
Added world names.
2014-12-31 17:50:43 +05:30
e0a8cc8537
Merge PlugLoad-linux.cpp and PlugLoad-darwin.cpp
2014-12-29 10:33:54 -05:00
a1c9f85a64
Repairing the stuck Alt key
...
SDL has been reporting the modifier key state incorrectly after alt-tabbing between the DF and DFHack windows.
Fixes issue #448 , though more testing is warranted.
2014-12-28 21:43:48 -07:00
9473f3b28e
Point Homebrew users to a GCC 4.5 formula that works on 10.10
2014-12-28 21:46:17 -05:00
3c0ac70615
Remove output from filetype()
...
Not sure how this made it in, but it's causing problems with PRINT_MODE:TEXT (not to mention filling up stdout.log)
2014-12-27 15:05:43 -05:00
efc42c253e
Fix remaining issues with mousequery
2014-12-27 11:03:06 -05:00
5a404333ca
Update devel/export-dt-ini for 0.40.21+
...
https://github.com/splintermind/Dwarf-Therapist/commit/356ae80
2014-12-26 12:39:05 -05:00
d95c0878e1
fix -info option
...
to export info instead of detailed maps (oops!)
2014-12-24 22:10:04 +11:00
lethosor
Matthew Townsend
Chris Dombroski
Eric Wald
Japa
PeridexisErrant
Lethosor