Commit Graph

2277 Commits (16c2d4df99bd39e22be03bf5b07fc366600498ea)

Author SHA1 Message Date
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
expwnent 7859da7d77 Update stonesense. 2014-11-30 12:31:29 -05:00
expwnent 921f0dd06a Merge remote-tracking branch 'quietust/develop' into develop 2014-11-30 11:31:59 -05:00
expwnent 9dbe639919 Merge pull request #402 from Ramblurr/stockpiles
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05: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
Casey Link d352d0f42d stockpiles: remove dependency on full protobuf 2014-11-27 14:23:54 +01:00
Casey Link de919050b1 Revert "install the full protobuf library"
This reverts commit 443a9676e1.
2014-11-27 13:40:11 +01:00
Casey Link 7cbb1ed043 Revert "use full protobuf library project wide"
This reverts commit f100d30f56.
2014-11-27 13:39:30 +01:00
Casey Link b6f5bcb7dc stockpiles: fix compilation on windows
VS2010 only supports a subset of C++11
2014-11-27 13:28:17 +01:00
lethosor 445640f80c Allow commands invoked through command-prompt to access selected items/units/buildings
Fixes #273
2014-11-25 20:25:31 -05:00
Quietust 84d24ca13f Fix Hold->HoldTerrain, also use a proper fix for Attack 2014-11-25 11:30:25 -06:00
Casey Link f100d30f56 use full protobuf library project wide
since plugins are using full protobuf, there is no reason
for everything not to. this removes the need to ship both the full
protobuf lib and the protobuf-lite lib.
2014-11-25 10:48:51 +01:00
Casey Link 063b669f6b stockpiles: cleanup output and add docs 2014-11-22 18:57:56 +01:00
Casey Link 00c1676744 stockpiles: correct typo 2014-11-22 18:54:22 +01:00
Casey Link e599f4b1e1 stockpiles: more user documentation 2014-11-22 18:33:49 +01:00
Casey Link f2d4bf53bd stockpiles: fix empty list crash
I was clear()ing all empty stockpile index vectors , but DF expects them
to be initialized with '\0' despite the fact they aren't used.

To keep DF happy and prevent segfaults, we now initialize all lists to
their appropriate sizes with a sane default value.
2014-11-22 18:33:49 +01:00
Casey Link 869a92dfc5 stockpiles: handle all metals and stones 2014-11-22 18:33:49 +01:00
Casey Link 0e8832f05d stockpiles: overwrite existing files 2014-11-22 18:33:49 +01:00
Casey Link f1ce575be3 stockpiles: animals list still shown even when disabled 2014-11-22 18:33:49 +01:00
Casey Link 4f2851199e stockpiles: handle animal cages and prepared meals 2014-11-22 18:33:49 +01:00
Casey Link e525b47815 stockpiles: make gem other mats more robust 2014-11-22 18:33:49 +01:00
Casey Link eb3a71c739 stockpiles: fix finished goods quality 2014-11-22 18:33:48 +01:00
Casey Link 12b27e09bb stockpiles: handle furniture sand_bags field 2014-11-22 18:33:48 +01:00
Casey Link 98a1278128 stockpiles: fix quality unserialization 2014-11-22 18:33:48 +01:00
Casey Link cc1e4d16a2 stockpiles: allow loading without file extension 2014-11-22 18:33:48 +01:00
Casey Link e66732f731 stockpiles: add missing protobuf field 2014-11-22 18:33:48 +01:00
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
lethosor 4922c36ada Prevent farm-plot-select from selecting crops when no crops are listed
Fixes #396
2014-11-18 19:57:29 -05: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
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
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