a962865b7f
Merge remote-tracking branch 'dfhack/develop' into develop
2015-01-15 22:54:42 -05:00
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
49cb05ac89
Merge remote-tracking branch 'peridexis/finish-needs_porting' into develop
2015-01-15 22:52:46 -05:00
a78d4cc5f0
Merge pull request #488 from warmist/advfort
...
Update advfort.lua
2015-01-15 22:49:17 -05:00
06c4755168
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
...
Conflicts:
NEWS
Readme.html
2015-01-15 22:45:57 -05:00
947cc879bd
Update NEWS.
2015-01-15 22:30:28 -05:00
14aa68a27f
Merge remote-tracking branches 'lethosor/remove-embark', 'lethosor/search-menus', 'lethosor/osx-package-name', 'lethosor/expose-modstate' and 'lethosor/patch-11' into develop
2015-01-15 22:24:05 -05:00
aa276b2d0c
Update NEWS.
2015-01-15 22:16:13 -05:00
8f4b766107
EventManager: Fix a crash bug with EQUIPMENT_CHANGE event.
2015-01-15 18:13:19 -05:00
6b3e6a6bdb
Update NEWS for blueprint plugin
2015-01-14 19:29:06 -05:00
bc30d7cdda
Update documentation for new plugin
2015-01-14 15:40:47 -05:00
da2224b0ba
Changed how parameters are parsed.
2015-01-14 14:58:15 -05:00
106612f386
Use alternate qf syntax for output.
2015-01-14 14:08:54 -05:00
d0273b8eff
Now puts room designations in the query blueprint
2015-01-13 16:15:54 -05:00
f315ee43a4
Added stockpiles
2015-01-13 14:28:28 -05:00
3489c2f39a
Buildings complete
2015-01-13 09:40:24 -05:00
f510cd7c11
Update advfort.lua
...
Fix bug with building jobs
2015-01-13 10:30:53 +02:00
e20808b6f6
Allow `dfhack` script to be run from other directories on OS X
2015-01-11 13:53:51 -05:00
077d149d64
Expose key modifier state to C++/Lua
2015-01-11 12:51:02 -05:00
ea313b6bf5
plugins/blueprint.cpp: Buildings hopefully
2015-01-09 16:00:47 -05:00
aa332e18e2
Remove stray whitespace
2015-01-08 16:59:37 -05:00
859fdd60d6
annoucnement -> announcement
2015-01-08 16:59:25 -05:00
b627240943
Dig mode complete
2015-01-08 12:17:18 -05:00
819327348b
Blueprint plugin basic structure
...
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
9f0558b547
Allow for other hotkeys keybinds
...
Using this method is more compact and more flexible. Also tabs to
spaces...
2015-01-08 13:10:11 +11:00
4ab233694f
tabs -> space in NEWS
2015-01-08 13:02:07 +11:00
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
4999086846
Use "OSX" in package names on OS X instead of "Darwin"
2015-01-07 16:03:24 -05:00
5b54909886
Move hotkey-notes to scripts, delete needs_porting!
...
The notes script is unfinished, but that's the last thing to do - since
everything else is obsolete, ported, or the subject of a github issue to
make a replacement.
2015-01-06 22:48:24 +11:00
d833005832
delete un-portable plugins
...
copypaste needs to be redone, not ported (see issue #479 ).
creaturemanager is obsolete due to the manipulator plugin, vjeck's
scripts for the cheaty bits, and changes to DF itself.
2015-01-06 22:43:09 +11:00
c39cf1fb49
Add room assignment search
2015-01-05 21:09:30 -05:00
2db6c0c735
Update NEWS.
2015-01-05 20:34:09 -05:00
448404a465
Fix buildingplan stuff on Windows.
2015-01-05 20:02:54 -05:00
1519d8e9ea
Disable fortplan and buildingplan for now because it doesn't compile on Windows.
2015-01-05 19:34:01 -05:00
7e11ad821f
Update xml.
2015-01-05 19:33:39 -05:00
cd64fb84b7
Make fortplan use Filesystem::getcwd()
2015-01-05 17:37:41 -05:00
d932c76242
Fix MapCache compiling error on Windows
2015-01-05 17:28:42 -05:00
f4b75787be
Update version in NEWS
2015-01-05 17:07:13 -05:00
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
expwnent
Chris Dombroski
warmist
Lethosor
lethosor
Peridexis Errant