Commit Graph

10339 Commits (12315fc5dd7880fc9b3a0c2c47daebcfefe83a52)
 

Author SHA1 Message Date
Japa 6297c83418 Merge branch 'develop' of https://github.com/DFHack/dfhack 2014-12-11 18:06:44 +05:30
Japa 22edb5a033 Merge branch 'master' of https://github.com/DFHack/dfhack
Conflicts:
	library/xml
	plugins/isoworld
	plugins/rendermax/CMakeLists.txt
	plugins/rendermax/renderer_light.cpp
	plugins/rendermax/renderer_light.hpp
	plugins/rendermax/renderer_opengl.hpp
	plugins/rendermax/rendermax.cpp
	plugins/rendermax/rendermax.lua
2014-12-11 17:53:19 +05:30
Warmist 550cddc604 Gui for item selection in advfort 2014-12-10 00:09:28 +02:00
Warmist f47565465e more fixes, improvements 2014-12-08 22:19:22 +02:00
Putnam3145 17772954cc Made restrictive mat filter work properly
Yeah, not sure what the heck I was doing there before.
2014-12-07 21:04:39 -08:00
Warmist f84a5dbce1 Fixed a bug where it does not find building ref. 2014-12-08 00:55:46 +02:00
Warmist 05887ffdb8 Fixed advfort somewhat: now it teleports items so you can build/craft stuff. 2014-12-07 22:21:19 +02:00
Warmist c1da5e2741 Removed (for now) all the cruft involving item selection gui. Added unit_action for adventurer to perform work. 2014-12-07 22:21:18 +02:00
expwnent 8e6fcac92e persist-table bug. 2014-12-07 07:56:33 -05:00
lethosor 09681cf029 Update skeleton plugin 2014-12-06 20:55:57 -05:00
lethosor 88b51fcb5b Allow strangemood to work if debug_nomoods is not available 2014-12-06 20:29:08 -05:00
lethosor a615723b38 Update remaining plugins to use REQUIRE_GLOBAL 2014-12-06 19:30:05 -05:00
lethosor 5de3e6110a Merge remote-tracking branch 'origin/develop' into plugin-globals 2014-12-06 17:32:44 -05:00
Casey Link b9a2ecb440 stockpiles: properly initialize quality arrays
Props to @fricy for identifying this bug.
2014-12-05 17:39:29 +01:00
Casey Link b0e0bbda9b stockpiles: show proper cased names in filter list 2014-12-05 16:53:19 +01:00
Casey Link 52f4cb3fc1 stockpiles: load prompt uses typing + filtering 2014-12-05 14:49:40 +01:00
Casey Link 729f7e7236 stockpiles: update NEWS & Readme 2014-12-05 13:32:01 +01:00
Casey Link 332566f6a1 stockpiles: disable gui/script when plugin is disabled 2014-12-05 13:27:58 +01:00
Casey Link 0f06eb7f6f stockpiles: quiet debug 2014-12-05 12:42:59 +01:00
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