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
|
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 |
expwnent
|
aa276b2d0c
|
Update NEWS.
|
2015-01-15 22:16:13 -05:00 |
expwnent
|
8f4b766107
|
EventManager: Fix a crash bug with EQUIPMENT_CHANGE event.
|
2015-01-15 18:13:19 -05:00 |
Chris Dombroski
|
6b3e6a6bdb
|
Update NEWS for blueprint plugin
|
2015-01-14 19:29:06 -05:00 |
Chris Dombroski
|
bc30d7cdda
|
Update documentation for new plugin
|
2015-01-14 15:40:47 -05:00 |
Chris Dombroski
|
da2224b0ba
|
Changed how parameters are parsed.
|
2015-01-14 14:58:15 -05:00 |
Chris Dombroski
|
106612f386
|
Use alternate qf syntax for output.
|
2015-01-14 14:08:54 -05:00 |
Chris Dombroski
|
d0273b8eff
|
Now puts room designations in the query blueprint
|
2015-01-13 16:15:54 -05:00 |
Chris Dombroski
|
f315ee43a4
|
Added stockpiles
|
2015-01-13 14:28:28 -05:00 |
Chris Dombroski
|
3489c2f39a
|
Buildings complete
|
2015-01-13 09:40:24 -05:00 |
Lethosor
|
e20808b6f6
|
Allow `dfhack` script to be run from other directories on OS X
|
2015-01-11 13:53:51 -05:00 |
lethosor
|
077d149d64
|
Expose key modifier state to C++/Lua
|
2015-01-11 12:51:02 -05:00 |
Chris Dombroski
|
ea313b6bf5
|
plugins/blueprint.cpp: Buildings hopefully
|
2015-01-09 16:00:47 -05:00 |
lethosor
|
aa332e18e2
|
Remove stray whitespace
|
2015-01-08 16:59:37 -05:00 |
lethosor
|
859fdd60d6
|
annoucnement -> announcement
|
2015-01-08 16:59:25 -05:00 |
Chris Dombroski
|
b627240943
|
Dig mode complete
|
2015-01-08 12:17:18 -05:00 |
Chris Dombroski
|
819327348b
|
Blueprint plugin basic structure
It should be able to load and make empty blueprint files.
|
2015-01-08 08:28:54 -05:00 |
lethosor
|
4999086846
|
Use "OSX" in package names on OS X instead of "Darwin"
|
2015-01-07 16:03:24 -05:00 |
lethosor
|
c39cf1fb49
|
Add room assignment search
|
2015-01-05 21:09:30 -05:00 |
expwnent
|
2db6c0c735
|
Update NEWS.
|
2015-01-05 20:34:09 -05:00 |
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 |