Commit Graph

5625 Commits (f2eec3198c3a460d2c8feaa6ed6885e390d787e3)
 

Author SHA1 Message Date
Casey Link 7072252902 fix build error on windows
with certain #include permutations the lack of this define would
break the build on windows as windows.h pollutes the namespace with min
and max macros that conflict with std::min and std::max.
2014-12-05 12:35:24 +01:00
Casey Link 346f397bca stockpiles: fix loading crash 2014-12-05 12:35:24 +01:00
Casey Link 7e6066daf2 stockpiles: user friendly error handling
* display errors in the GUI when necessary
* handle older versions of DFHack without the persist module
2014-12-05 12:35:24 +01:00
Casey Link 2f4678eee5 stockpiles: more error handling & cleanup
* prevent crashes when the path doesn't exist
* remove duplicated functions
* sort file list case insensitively
2014-12-05 12:35:24 +01:00
lethosor 1525823948 Create stocksettings directory on startup if necessary 2014-12-05 12:35:24 +01:00
Casey Link 1f1780cae9 stockpiles: fix usage help 2014-12-05 12:35:24 +01:00
Casey Link 085c18ab2a update NEWS and README with new stockpiles UI info 2014-12-05 12:35:24 +01:00
Casey Link b6118d272c stockpiles: integrate gui plugin into dfhack.init-example 2014-12-05 12:35:24 +01:00
Casey Link 1cde8cffa4 stockpiles: implement GUI controls 2014-12-05 12:35:19 +01:00
Casey Link 2e43ea8b38 stockpiles: refactor code into separate files
The file was approaching 3000 lines and contained multiple classes,
making it a real PITA to navigate through. upcoming features would only
add more LOC, so splitting was necessary.
2014-12-05 11:02:40 +01:00
expwnent 10fa55570e Update release version. 2014-12-05 00:10:59 -05:00
expwnent e8411bd4a4 Update NEWS. 2014-12-04 23:58:19 -05:00
expwnent 77ea4ee921 Update html. 2014-12-04 23:54:16 -05:00
expwnent 19e977528c Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
Conflicts:
	NEWS
2014-12-04 23:49:13 -05:00
expwnent 6e86336b8f Merge pull request #427 from Ramblurr/fix-teleport
teleport: fix unused code causing crash
2014-12-04 23:39:13 -05:00
expwnent a107e41bda Merge pull request #430 from splintermind/master
update DT scripts for versions 29.0.0+
2014-12-04 23:38:34 -05:00
expwnent c83ed531bc Merge remote-tracking branches 'lethosor/stocks-esc', 'lethosor/patch-8', 'lethosor/0.40.19-update-labors' and 'lethosor/fixTexts' into develop 2014-12-04 23:34:48 -05:00
expwnent bd7cb578eb Update xml. 2014-12-04 23:31:05 -05:00
lethosor f1a863eb79 Use short plugin name 2014-12-03 23:27:52 -05:00
lethosor cac2245438 Update some plugins to use REQUIRE_GLOBAL 2014-12-03 23:26:54 -05:00
Lethosor 16c2d4df99 stocks: Make LEAVESCREEN have priority over text entry
This should fix conflicts if LEAVESCREEN is bound to "Space" only
2014-12-03 17:52:42 -05:00
Josh 5d1efa82f1 update DT scripts 2014-12-03 23:34:22 +01:00
Casey Link c1d36be6e8 teleport: fix unused code causing crash
The `teleportSettings` variable was never used and the line referenced
the non-existing function `getArgsTogether`
2014-12-03 11:33:05 +01:00
lethosor e206c242c6 Add a plugin_globals vector to aid in safety checks for plugins that require globals
This allows "using df::global::foo" to be replaced by "REQUIRE_GLOBAL(foo)",
and DFHack will refuse to load the plugin if df::global::foo is NULL
2014-12-02 21:32:04 -05:00
Lethosor 46eccdb152 Bind `hotkeys` to Alt-F1
Ctrl-F1 is a system-wide shortcut by default on OS X
2014-12-02 18:01:53 -05:00
lethosor 2d7ea52c40 Clarify autolabor initialization failure 2014-12-02 17:58:30 -05:00
lethosor e3c13fc555 Add gelding to autolabor and manipulator 2014-12-02 17:30:16 -05:00
Alexander Gavrilov 760acf017b Update version to v0.40.19 2014-12-02 13:51:44 +03:00
quipyowert f4e8fa2f30 Define a static variable to fix debug mode crash.
Fixes #404
2014-12-01 17:19:20 -08:00
lethosor 7ddd3ca319 Expand fixTexts.sh
* Fall back to `rst2html.py` (the default location "setup.py" installs to)
  if `rst2html` is not available
* Warn if the installed docutils version is below 0.12, to avoid extraneous
  CSS changes between docutils versions
* Add a status message for updated files
* Update HTML files
2014-12-01 16:13:31 -05:00
expwnent 5aa05a7276 Update Readme.html. 2014-11-30 16:49:16 -05:00
expwnent bf7f746aa9 Fix Readme.rst so it will compile. 2014-11-30 16:48:58 -05:00
expwnent 83d3785735 Update xml. 2014-11-30 14:03:00 -05:00
expwnent 7859da7d77 Update stonesense. 2014-11-30 12:31:29 -05:00
expwnent 868bc4c7fb Update xml. 2014-11-30 11:32:46 -05:00
expwnent 921f0dd06a Merge remote-tracking branch 'quietust/develop' into develop 2014-11-30 11:31:59 -05:00
expwnent d9ae3cc612 Removed removebadthoughts and updated Readme.rst and NEWS. 2014-11-30 09:26:04 -05:00
expwnent 81b75161d6 Updated remove-stress to the new argument system. 2014-11-30 09:23:35 -05:00
PeridexisErrant 5dcec6f683 Add Putnam's remove-stress script 2014-11-30 22:30:13 +11:00
expwnent 9dbe639919 Merge pull request #402 from Ramblurr/stockpiles
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
expwnent 5b1eb0e770 Merge remote-tracking branch 'lethosor/cmdprompt-cursor' into develop 2014-11-28 23:13:09 -05:00
expwnent 5912f63253 Update NEWS. 2014-11-28 23:03:39 -05:00
expwnent 16fcdc3035 modtools/item-trigger should now work with items 2014-11-28 23:03:27 -05:00
expwnent 762f5231e2 reaction-trigger typo. 2014-11-28 23:01:44 -05:00
Patrick Dawson a6ae6d4c28 autolabor: Fix compile on Windows.
VC10 wants an explicit return type for lambdas.
2014-11-28 00:55:26 +01:00
Patrick Dawson 794e1ee6f0 autolabor: Document and improve the talent pool parameter. 2014-11-27 21:13:20 +01:00
Casey Link cb6d4da2f2 stockpules: fix protobuf-lite support
Looks like we lost more than just TextFormat when we lost full protobuf
support. Copied these two serialization functions over.
2014-11-27 16:36:42 +01:00
Patrick Dawson 8b1b32a499 autolabor: Add a talent pool parameter. 2014-11-27 15:56:14 +01:00
Casey Link 1c496fb255 add savestock and loadstock to NEWS and Readme.rst 2014-11-27 14:49:16 +01:00
Casey Link d352d0f42d stockpiles: remove dependency on full protobuf 2014-11-27 14:23:54 +01:00