Commit Graph

5848 Commits (2d9197df504a1a9fa9210f85e4fd550593d5614f)
 

Author SHA1 Message Date
Casey Link 79c65e0fcf stockpiles: fix male/female creature mat lookups 2014-11-22 18:33:48 +01:00
Casey Link 44af084e8e stockpiles: import from disk and write to memory 2014-11-22 18:33:48 +01:00
Casey Link 543a88d03d stockpiles: pass correct filename 2014-11-22 18:33:48 +01:00
Casey Link c251aeabe3 stockpiles: add optional debug output 2014-11-22 18:33:48 +01:00
Casey Link 86ba81a3a9 stockpiles: format with ANSI style and 4 spaces 2014-11-22 18:33:48 +01:00
Casey Link a4d19070e8 stockpiles: write some documentation 2014-11-22 18:33:48 +01:00
Casey Link f7ed821ef9 stockpiles: serialization complete
* working file import/export
2014-11-22 18:33:48 +01:00
Casey Link 224a19295d stockpiles: serialize through weapons+trap components
* generalize itemdefs
2014-11-22 18:33:48 +01:00
Casey Link 25f6c440d8 stockpiles: serialize through cloth 2014-11-22 18:33:47 +01:00
Casey Link d74ac1b3a6 stockpiles: serialize through leather
* more code reuse!
2014-11-22 18:33:47 +01:00
Casey Link e863df512b stockpiles: serialize through finished goods
* add stubs for remaining categories
* refactor w/ generics to reuse code
2014-11-22 18:33:47 +01:00
Casey Link dc5f0fed1a stockpiles: serialize ammo and coins 2014-11-22 18:33:47 +01:00
Casey Link d167b3f385 stockpiles: basic serialization for animals - stone 2014-11-22 18:33:47 +01:00
Casey Link 443a9676e1 install the full protobuf library
required to access text_format (needed by stockpiles plugin)
2014-11-22 18:33:47 +01:00
Casey Link ebb1345332 stockpiles: add settings protobuf message format 2014-11-22 18:33:47 +01:00
expwnent d0b0f03060 Merge pull request #401 from lethosor/dfhack-log
Log output of "dfhack" script to dfhack.log
2014-11-22 10:34:06 -05:00
lethosor 50765dd60f Log output of "dfhack" script to dfhack.log 2014-11-22 10:08:38 -05:00
expwnent a6b5ffef79 Update NEWS. 2014-11-20 00:05:33 -05:00
expwnent 56fb63ae6d Update version to 0.40.16-r1. 2014-11-20 00:04:12 -05:00
expwnent 855d27745d Update xml. 2014-11-19 23:57:02 -05:00
expwnent afd7b9cf0b Merge pull request #398 from Putnam3145/patch-5
Update add-thought.lua
2014-11-19 09:35:57 -05:00
expwnent 330388b803 Merge pull request #399 from lethosor/fix-farm-plot-select-crash
Prevent farm-plot-select from selecting crops when no crops are listed
2014-11-19 09:35:34 -05:00
lethosor 4922c36ada Prevent farm-plot-select from selecting crops when no crops are listed
Fixes #396
2014-11-18 19:57:29 -05:00
Putnam3145 ae6675a188 Update add-thought.lua 2014-11-17 22:47:33 -08:00
expwnent d83c32a0c5 Merge pull request #397 from lethosor/fatal-error-stdout
Print fatal errors to stdout on Linux/OS X
2014-11-18 00:24:24 -05:00
lethosor a003ce7394 Print fatal errors to stdout on Linux/OS X 2014-11-17 15:12:33 -05:00
expwnent 97b44d5898 persist-table tweaks, delete debug print messages 2014-11-16 20:41:11 -05:00
expwnent f2e594ddfb Merge remote-tracking branch 'jjyg/develop' into develop 2014-11-16 17:07:36 -05:00
expwnent 7560fbdb6b library/lua/persist-table.lua: now it uses metatables to make persistent memory storage even easier. 2014-11-16 17:06:59 -05:00
Yoann Guillot c43685ae76 superdwarf: remove ruby global function 2014-11-16 13:06:14 +01:00
Yoann Guillot 889bd06ffc ruby: fix windows platform detection 2014-11-16 13:00:38 +01:00
lethosor 9fd6e9f03c Expand dwarfmonitor weather indicator 2014-11-15 17:29:19 -05:00
expwnent 1aeb4e5769 Merge remote-tracking branch 'lethosor/update-falconne-plugins' into develop 2014-11-15 16:50:09 -05:00
lethosor fc758fdbe4 NEWS: Consistent spacing 2014-11-15 16:48:06 -05:00
lethosor fa79f297a3 Update NEWS 2014-11-15 16:46:46 -05:00
lethosor bc73319333 Make rain indicator LIGHTBLUE for better visibility 2014-11-15 16:39:19 -05:00
lethosor 9b0d0eba45 Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins 2014-11-15 16:36:35 -05:00
lethosor 4513fa4ab2 Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins 2014-11-15 16:34:59 -05:00
lethosor 61fa2fbda0 Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins
Conflicts:
	NEWS
	plugins/CMakeLists.txt
	plugins/automelt.cpp
2014-11-15 16:31:51 -05:00
expwnent 798bec3ced Merge branch 'delvintemp' into develop 2014-11-15 16:28:52 -05:00
lethosor f7fcb342ed Fix buildingplan compiling with GCC 2014-11-15 16:21:47 -05:00
lethosor 578ac08999 Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins 2014-11-15 16:18:00 -05:00
lethosor 3c1e07252b Update autotrade stockpile controls 2014-11-15 16:16:32 -05:00
expwnent 2edc3594b8 Make it compile. 2014-11-15 16:03:36 -05:00
lethosor 842bd3581d Merge remote-tracking branch 'falconne/plugin_mousequery' into update-falconne-plugins 2014-11-15 15:58:41 -05:00
lethosor d62305b69e Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins
Conflicts:
	plugins/autotrade.cpp
2014-11-15 15:56:44 -05:00
lethosor d18ed6df5e Merge remote-tracking branch 'falconne/plugin_hotkeys' into update-falconne-plugins
Conflicts:
	plugins/CMakeLists.txt
2014-11-15 15:45:51 -05:00
expwnent 723d6af9f8 Merge https://github.com/Mchl/dfhack into develop. Manually remove trailing whitespace, update NEWS.
Conflicts:
	scripts/forum-dwarves.lua
2014-11-15 15:33:48 -05:00
expwnent 15194613f5 Manually add hobotron's superdwarf fix. 2014-11-15 15:23:00 -05:00
expwnent 3021fa47db Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
Conflicts:
	NEWS
2014-11-15 15:07:20 -05:00