8769af8935
Merge branch 'develop' of https://github.com/expwnent/dfhack into develop
2014-10-31 13:34:20 -05:00
f08a32f4e2
Update Manipulator to display stress level instead of happiness
2014-10-31 13:33:35 -05:00
ed225de365
Update strangemood to check stress level for fell/macabre moods
2014-10-31 13:33:18 -05:00
f683395cae
Comment out more of military-training tweak, which no longer compiles
2014-10-31 13:33:04 -05:00
d05f249619
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-10-31 13:32:49 -05:00
72654e602a
Merge pull request #355 from lethosor/patch-6
...
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
04ec2c9932
Update version to v0.40.14 and hack things so they compile.
...
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
beebd624e7
Last xml update for v0.40.13
2014-10-26 13:20:45 +03:00
cdcc0d228d
Merge branch 'develop' of https://github.com/angavrilov/dfhack into develop
2014-10-08 11:30:06 -05:00
0fd3f3dbf4
Update digFlood documentation to mention onLoad(World).init
...
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
0471294b1e
Fix syndrome-util.
2014-10-04 21:54:07 -04:00
0df2d71506
Fix repeat.lua documentation.
2014-10-04 21:52:28 -04:00
eed684a8df
fix superdwarf
2014-09-26 11:39:05 +02:00
0766538ecd
ruby: add df.print_color(col, string)
2014-09-25 15:53:03 +02:00
1a38c72763
ruby: add stl-fstream to codegen
2014-09-25 13:19:00 +02:00
6046d68639
Support std::fstream in data structures and add file_compressorst to xml.
...
One tricky thing is that fstream does not have operator=, so the new
file_compressorst requires a manually implemented one that skips it.
2014-09-24 22:47:04 +04:00
b0b6a82c92
Merge remote-tracking branch 'jjyg/develop'
2014-09-19 17:09:43 -04:00
218f1c27e7
Update NEWS.
2014-09-19 16:42:06 -04:00
ebab62744e
Merge remote-tracking branch 'dfhack/develop' into HEAD
2014-09-19 16:39:11 -04:00
a0c55b8bc5
Update NEWS.
2014-09-19 16:26:23 -04:00
0e8d6c6c0a
Merge remote-tracking branch 'eswald/spurious-e'
2014-09-19 16:23:54 -04:00
c894346639
ruby: call RUBY_INIT_STACK
2014-09-19 21:38:22 +02:00
d75c01b0ff
merge git://github.com/hobotron-df/dfhack
2014-09-19 21:37:28 +02:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
1b3e1b8e92
No longer prints -e when DF finishes.
...
That echo option is a bash-specific extension, unavailable under other shells.
Fortunately, a bare echo with no arguments prints the single newline required here.
2014-09-17 19:29:47 -06:00
1983a05fb5
Merge remote-tracking branch 'lethosor/update-news'
2014-09-16 18:04:42 -04:00
46864e02c6
Update NEWS.
2014-09-16 17:51:29 -04:00
f014ab4088
Update NEWS.
2014-09-16 17:26:01 -04:00
c927f0fa3c
Merge remote-tracking branch 'lethosor/patch-5'
2014-09-16 17:25:28 -04:00
da366419fc
Update NEWS.
2014-09-16 17:24:33 -04:00
fde49176fe
Merge remote-tracking branch 'lethosor/update-search-keys'
2014-09-16 17:23:45 -04:00
566aa54e1c
Update NEWS.
2014-09-16 17:22:48 -04:00
0fbc7e22ee
Merge remote-tracking branch 'lethosor/patch-4'
2014-09-16 17:21:39 -04:00
040acd166b
Merge remote-tracking branch 'eswald/automelt'
...
Conflicts:
dfhack.init-example
2014-09-16 17:20:50 -04:00
5650405b55
Update NEWS.
2014-09-16 17:19:06 -04:00
2cd7b5b983
Merge branch 'expand-dfhack.init-example' of https://github.com/PeridexisErrant/dfhack
2014-09-16 17:15:33 -04:00
f114aee758
Merge branch 'fix-exportlegends' of https://github.com/PeridexisErrant/dfhack
2014-09-16 17:13:51 -04:00
b801870b47
Update NEWS.
2014-09-16 17:12:49 -04:00
a225984bc5
Merge remote-tracking branch 'eswald/hotkeys'
2014-09-16 17:11:15 -04:00
9716b30eac
Update NEWS.
2014-09-16 17:09:43 -04:00
d425c2edf9
Merge remote-tracking branch 'lethosor/lua-printall-ipairs'
2014-09-16 17:08:45 -04:00
5a1d88307f
Merge remote-tracking branch 'eswald/stockpile-iterator'
2014-09-16 17:05:02 -04:00
05e6389a75
Update NEWS.
2014-09-16 17:03:05 -04:00
39bfe71453
Merge remote-tracking branch 'putnam/patch-3'
2014-09-16 16:55:48 -04:00
3e882f35b3
Merge remote-tracking branch 'lethosor/global-onload'
2014-09-16 16:53:31 -04:00
d223655dc7
Bump version to 0.40.12-r1.
2014-09-16 16:53:19 -04:00
8508dd6f04
Update xml.
2014-09-16 16:51:48 -04:00
328b95c1ec
Merge remote-tracking branch 'origin/develop' into global-onload
2014-09-14 11:56:07 -04:00
d21cd54648
Add '@' documentation to dfhack.lua
2014-09-14 11:50:03 -04:00
1ea1b50790
job_material_category -> dfhack_material_category
...
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
Quietust
expwnent
Alexander Gavrilov
Lethosor
expwnent
jj
Eric Wald
lethosor