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 |
lethosor
|
3c1e07252b
|
Update autotrade stockpile controls
|
2014-11-15 16:16:32 -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 |
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 |
Yoann Guillot
|
8042c5d342
|
ruby: load arch-specific ruby-autogen
|
2014-11-14 12:49:08 +01:00 |
Yoann Guillot
|
696380e749
|
ruby: distinguish ruby-autogen.rb name based on architecture
|
2014-11-14 12:47:42 +01:00 |
Yoann Guillot
|
e2229f6a6a
|
ruby: remove DL_RUBY cmake option
|
2014-11-14 12:38:24 +01:00 |
Alexander "Ace" Olofsson
|
be1d411b83
|
Add missing <functional> include for std::greater
|
2014-11-09 11:19:51 +01:00 |
expwnent
|
1b0a2ecb8a
|
Merge remote-tracking branch 'eswald/tradescreen' into develop
Conflicts:
NEWS
|
2014-11-09 00:42:50 -05:00 |
expwnent
|
c9cf94128e
|
Merge pull request #376 from lethosor/mousequery-z-level-fix
Fix selection behavior of mousequery on lowest z-level
|
2014-11-09 00:37:46 -05:00 |
expwnent
|
267d0837ad
|
Merge pull request #381 from lethosor/update-cmakelists
Re-enable rendermax in CMakeLists.txt
|
2014-11-09 00:34:23 -05:00 |
expwnent
|
7929d44030
|
Merge pull request #382 from PeridexisErrant/autolabor-fixes
Autolabor fixes
|
2014-11-09 00:33:46 -05:00 |
expwnent
|
8e492b1669
|
Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
Make dwarfmonitor compile for 0.40.14+
|
2014-11-09 00:33:14 -05:00 |
lethosor
|
f069676fc2
|
Fix automaterial/box-select cursor color
Only use a dark green cursor when actually building a construction
|
2014-11-08 19:05:45 -05:00 |
lethosor
|
2484f89542
|
Update dwarfmonitor's happiness display
|
2014-11-08 15:08:56 -05:00 |
lethosor
|
04ceb64bad
|
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
Conflicts:
NEWS
|
2014-11-08 14:36:20 -05:00 |
PeridexisErrant
|
195ccf4bc8
|
Fix beekeeping, enable help message
Plugins should now be enabled with "enable autolabor". The beekeeping
bug was fixed in DF0.40.07, so autolabor can set multiple beekeepers
again.
|
2014-11-08 11:45:20 +11:00 |
Lethosor
|
ec580cdfa5
|
Re-enable rendermax in CMakeLists.txt
|
2014-11-07 16:43:50 -05:00 |
Eric Wald
|
8ac9748700
|
Switching fast-trade Shift-Up to move before marking
This makes it undo Shift-Down, instead of mirroring it, which works much better when you've gone too far down the list.
|
2014-11-06 23:06:17 -07:00 |
Eric Wald
|
46ebeaa722
|
Adding Shift-Up to the fast-trade tweak.
|
2014-11-06 22:22:02 -07:00 |