lethosor
|
7823a14a8f
|
Merge remote-tracking branch 'Putnam3145/patch-10' into develop
Conflicts:
NEWS
|
2015-02-06 17:08:00 -05:00 |
Lethosor
|
8bc9bcfcb1
|
Merge pull request #533 from Putnam3145/patch-11
Added subthought properly to add-thought.
|
2015-02-06 16:58:40 -05:00 |
Putnam3145
|
0baf0603ad
|
Update NEWS
|
2015-02-06 13:53:55 -08:00 |
|
Putnam3145
|
2b438a2970
|
Update NEWS
|
2015-02-05 00:26:33 -08:00 |
|
Lethosor
|
67bf26dbbe
|
Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
New tweak to display pet genders on trade request screen
|
2015-02-03 08:25:12 -05:00 |
|
lethosor
|
d2aeffe3bc
|
Add tweak tradereq-pet-gender to documentation
|
2015-02-02 10:04:43 -05:00 |
expwnent
|
710dddc1c0
|
Update NEWS.
|
2015-02-02 05:23:16 -05:00 |
|
expwnent
|
10f4f94b57
|
Update documentation.
|
2015-02-02 05:20:43 -05:00 |
|
expwnent
|
0f01583972
|
Fix news
|
2015-01-31 23:36:34 -05:00 |
|
expwnent
|
e006eb21e8
|
Bump version and update NEWS.
|
2015-01-31 23:22:42 -05:00 |
|
expwnent
|
bf5e491647
|
Allow Lua scripts to be used as modules.
|
2015-01-31 22:43:54 -05:00 |
|
expwnent
|
e9b4fc513a
|
Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
Conflicts:
NEWS
plugins/zone.cpp
|
2015-01-31 21:01:41 -05:00 |
|
expwnent
|
aa5d7c11bc
|
Merge remote-tracking branches 'lethosor/patch-12' and 'lethosor/fs-expansion' into develop
Conflicts:
NEWS
|
2015-01-31 20:25:01 -05:00 |
|
expwnent
|
1d8fd55a4a
|
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
Conflicts:
NEWS
|
2015-01-31 20:22:17 -05:00 |
|
expwnent
|
b685aa2729
|
Merge remote-tracking branch 'peridexis/fix_hfs-pit' into develop
Conflicts:
NEWS
|
2015-01-31 20:19:42 -05:00 |
|
expwnent
|
1d10298246
|
Merge remote-tracking branch 'putnam/patch-9' into develop
Conflicts:
NEWS
|
2015-01-31 20:16:02 -05:00 |
|
expwnent
|
ab01e7d102
|
Eventful no longer requires LUA_HOOK to do reaction events.
|
2015-01-31 20:10:06 -05:00 |
|
lethosor
|
d93db31a0a
|
Update NEWS
|
2015-01-30 17:38:38 -05:00 |
Chris Dombroski
|
f2eec3198c
|
Rename findPenPitAtCoord
|
2015-01-29 15:02:54 -05:00 |
|
Chris Dombroski
|
4e5325ba62
|
Update NEWS
|
2015-01-29 14:59:15 -05:00 |
|
Chris Dombroski
|
43464fc71d
|
Update NEWS
|
2015-01-28 21:27:00 -05:00 |
Peridexis Errant
|
fa4a781763
|
Fix hfs-pit feature search
Via notfood, here:
http://www.bay12forums.com/smf/index.php?topic=139553.msg5984896#msg5984896
|
2015-01-28 09:33:26 +11:00 |
|
Putnam3145
|
a8c9b8cef8
|
Update NEWS with add-thought info.
|
2015-01-26 19:13:24 -08:00 |
|
expwnent
|
1443a64ddb
|
Update documentation.
|
2015-01-26 21:55:28 -05:00 |
|
expwnent
|
1993c5fb1b
|
Added support for multiline commands inside dfhack.init and the script command.
|
2015-01-26 17:18:30 -05:00 |
|
expwnent
|
08110312ff
|
No more caching DFHACK_RELEASE in CMake stuff.
|
2015-01-25 14:21:00 -05:00 |
|
expwnent
|
4f0cbb92d4
|
Update NEWS.
|
2015-01-23 22:58:23 -05:00 |
|
expwnent
|
edefeb8ae0
|
Update NEWS. A rare case where there are no merge errors but git gets it wrong.
|
2015-01-15 22:53:41 -05:00 |
|
expwnent
|
49cb05ac89
|
Merge remote-tracking branch 'peridexis/finish-needs_porting' into develop
|
2015-01-15 22:52:46 -05:00 |
|
expwnent
|
06c4755168
|
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
Conflicts:
NEWS
Readme.html
|
2015-01-15 22:45:57 -05:00 |
|
expwnent
|
947cc879bd
|
Update NEWS.
|
2015-01-15 22:30:28 -05:00 |
|
expwnent
|
aa276b2d0c
|
Update NEWS.
|
2015-01-15 22:16:13 -05:00 |
|
Chris Dombroski
|
6b3e6a6bdb
|
Update NEWS for blueprint plugin
|
2015-01-14 19:29:06 -05:00 |
|
Peridexis Errant
|
4ab233694f
|
tabs -> space in NEWS
|
2015-01-08 13:02:07 +11:00 |
|
Peridexis Errant
|
b030bb08fe
|
Finish and document hotkey-notes
All working correctly - thus ends the long story of the needs_porting
folder.
|
2015-01-08 11:11:09 +11:00 |
|
expwnent
|
2db6c0c735
|
Update NEWS.
|
2015-01-05 20:34:09 -05:00 |
|
lethosor
|
f4b75787be
|
Update version in NEWS
|
2015-01-05 17:07:13 -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
|
0cfe6a11a3
|
Merge remote-tracking branch 'eswald/alt-stuck'
Conflicts:
NEWS
|
2015-01-05 16:50:16 -05:00 |
|
lethosor
|
0c768796e2
|
Merge remote-tracking branch 'danaris/fortplan'
Conflicts:
plugins/buildingplan.cpp
|
2015-01-05 16:47:35 -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 |