Quietust
fd68971ac5
Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches
2017-07-02 07:31:31 -06:00
Japa
96dd5799f7
Add compatibility defines for 0.34.11
2017-06-30 01:00:31 +05:30
Ben Lubar
967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active.
2017-06-27 13:47:33 -05:00
lethosor
fe8be90992
Add "tweak burrow-name-cancel" to fix bug 1518
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1518
Closes #526
2017-06-25 16:42:30 -04:00
lethosor
10e13c532a
Add "tweak cage-butcher" and some extra Building module functions
...
* Buildings::markedForRemoval()
* Buildings::getCageOccupants()
Closes #906
2017-06-25 15:27:21 -04:00
Japa Illo
c9b5df8989
Merge develop
2017-06-24 11:00:14 +05:30
Japa Illo
52b9a8f4ad
Added a function to get a subset of the plant raws.
2017-06-24 10:52:09 +05:30
lethosor
bf8e65311b
Update submodules
2017-06-23 12:43:38 -04:00
Japa
31dbb792ca
Added a function to get a partial creature raw list.
2017-06-23 19:54:22 +05:30
Japa Illo
a2f6c80298
Add compatibility defines to remotefortressreader.cpp
2017-06-23 16:02:30 +05:30
lethosor
ae809afde7
Add Gui::refreshSidebar()
...
This handles feeding CURSOR_DOWN_Z and CURSOR_UP_Z properly, avoiding issues
when on the lowest z-level.
2017-06-23 00:02:21 -04:00
Japa
ac0134568e
Don't read empty rooms, and update version
2017-06-22 23:57:04 +05:30
Japa
34f55cec29
Merge remote-tracking branch 'origin/master'
2017-06-22 20:29:21 +05:30
Japa
0348de4880
Add a command to get the current RemoteFortressReader version
2017-06-22 20:29:10 +05:30
Japa Illo
9ae50279a1
Moved the version define into a header file, and fixed removing designations that are alreaddy converted to jobs.
2017-06-20 15:46:03 +05:30
Japa Illo
48f5fd7a39
Fix missing room info on sent buildings.
2017-06-20 11:06:37 +05:30
Japa Illo
96f9faea28
Merge remote-tracking branch 'DFHack/develop'
2017-06-20 10:51:52 +05:30
Japa Illo
3da9176c76
Update submodules
2017-06-20 10:51:41 +05:30
lethosor
65382473f7
Ruby: stop cpp_new from truncating vtable pointers
...
This fixes a crash in levers.rb, for instance.
2017-06-10 17:22:52 -04:00
lethosor
1321a64613
Remove lots of old/unused functions from the Units module
2017-06-10 17:21:34 -04:00
lethosor
acf50b755f
tweak hotkey-clear: fix label position
2017-06-08 11:20:56 -04:00
lethosor
a19e268923
Make re-invoking command-prompt hide the current prompt
2017-06-07 15:00:30 -04:00
lethosor
c3d5663320
Ruby: use Gui module to get selected unit
...
This allows "exterminate it" to work from command-prompt, among other things.
Fixes #1100
2017-06-06 23:34:34 -04:00
lethosor
b2f05834d9
buildingplan: fix an issue preventing some numbers from being used in names
2017-06-03 18:25:49 -04:00
lethosor
9f18cb5bdc
resume: use map y dimension and fix off-by-one error
2017-06-03 11:24:23 -04:00
lethosor
5278856b37
mousequery: Fix parameters to getDepthAt()
2017-06-02 15:39:23 -04:00
lethosor
62c9f2695a
automaterial: use uicommon.h, draw to map
2017-06-02 15:00:51 -04:00
lethosor
43c4a88068
Move some checks in paintTile/readTile after hooks are called
2017-06-02 00:40:14 -04:00
lethosor
044b3a0789
resume: use uicommon and draw to map
2017-06-01 16:19:11 -04:00
lethosor
2681392e27
siege-engine: use map tiles
2017-05-31 12:12:52 -04:00
Japa
9f2eaf35f1
Merge remote-tracking branch 'DFHack/develop'
2017-05-31 19:52:53 +05:30
lethosor
2905376042
Fix multiple issues with the confirm plugin
...
- Only allow one confirmation to be open at once. This avoids situations where
pressing "s" would open another confirmation instead of the settings screen
(e.g. in the trade screen), and allows all confirmations to be implemented
without priorities specified.
- Fix #821 : close any active confirmations when they are disabled.
- Some misc. cleanup, C++11 features
- Fixed a memory leak
2017-05-27 00:26:14 -04:00
lethosor
49ea61562f
uicommon: remove nullptr definition
...
This is available in GCC 4.8+ and MSVC 2015
2017-05-25 18:06:51 -04:00
Japa Illo
addbb1a94f
(Hopefully) send active-state wil all applicable buildings.
2017-05-25 15:38:31 +05:30
Japa
2d6dab0f24
Add a special case for retraction bridge direction
2017-05-23 21:41:34 +05:30
Japa
3f98cd3da0
Add active state to some building types.
2017-05-22 22:03:12 +05:30
lethosor
22de28c3ed
embark-tools sand: hide indicator when it overlaps with confirmation window
2017-05-19 11:49:25 -04:00
lethosor
b92095190f
Update stonesense, scripts, xml
2017-05-18 20:52:41 -04:00
Japa
5831665231
Fix wrong units used between two bounding boxes.
2017-05-14 16:07:05 +05:30
Japa
4ec42f7994
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2017-05-14 11:17:09 +05:30
Japa
236561ff43
get the full building list in the requested area in one go, rather than several overlapping chunks.
2017-05-14 11:12:41 +05:30
lethosor
d083b92e9c
probe: display tiletype enum names as well
2017-05-10 12:40:57 -04:00
lethosor
d42bfd7a1d
Merge remote-tracking branch 'quietust/develop' into develop
2017-05-10 10:28:49 -04:00
lethosor
5d9a3cdc99
Merge branch 'develop' of dfhack/dfhack into develop
2017-05-09 13:51:38 -04:00
lethosor
88f9eaeebb
stonesense: Disable overlay in STANDARD-based modes
...
Closes dfhack/dfhack#1078
2017-05-09 13:50:08 -04:00
lethosor
4dff218976
ruby: fix crash when unloading plugin on Windows
2017-05-09 13:49:07 -04:00
Quietust
67e60fdaa1
Fix issue #874 (revflood doesn't always see past constructed downstairs)
2017-05-07 13:23:33 -06:00
Japa
de7ef79d76
Merge remote-tracking branch 'DFHack/develop' into develop
2017-05-07 19:24:39 +05:30
Japa
a1f692686a
Use forward slashes instead of underscored to separate building subtypes
2017-05-07 19:24:30 +05:30
lethosor
d309839b74
Update stonesense - fix #1083
2017-05-06 15:15:32 -04:00
lethosor
3dc2c2259b
Update getplants to use Designations module
...
Fixes #531
Fixes #1014
Fixes #1018
2017-05-06 00:11:07 -04:00
lethosor
adaccceba7
autochop: fix display of unnamed burrows
2017-05-05 17:36:02 -04:00
lethosor
5c784f4ba3
autochop: Avoid moving menu options around when toggling burrows
2017-05-05 17:31:54 -04:00
lethosor
a527091172
autochop: Fix marking/unmarking trees (use Designations module)
...
Fixes #656
Fixes #1076
Closes #1030
2017-05-04 21:51:16 -04:00
lethosor
690fec9d81
manipulator: show social activities in job column
2017-04-28 17:26:20 -04:00
lethosor
3cfbd735dc
Update xml, stonesense, scripts
2017-04-23 17:14:22 -04:00
lethosor
098481c60d
Merge branch 'develop' of dfhack/dfhack into develop
2017-04-19 13:45:45 -04:00
lethosor
06737644cd
new tweak: hotkey-clear
2017-04-19 13:31:25 -04:00
Japa Illo
e36e4fa1c1
Support archery target rotation in RemoteFortressReader
2017-04-05 15:35:48 +05:30
Japa Illo
06225dd896
Send building items and items kept in buildings separately.
2017-03-30 16:23:14 +05:30
Japa
7c626ba3c2
Actually add the versionInfo function to the RPC list.
2017-03-29 22:05:49 +05:30
Japa
bbaf3210f1
Send DF version info over remoteFortressReader
2017-03-29 21:58:12 +05:30
Japa
c244901c16
Removed end of line space. (Sorry, travis)
2017-03-29 20:22:09 +05:30
Japa
19a253c132
Merge remote-tracking branch 'DFHack/develop' into develop
2017-03-29 19:46:55 +05:30
lethosor
78cb4a31b9
New tweak: condition-material (fixes bug 9905)
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9905
2017-03-28 09:50:38 -04:00
Japa
5ea964b9cf
Send building items with buildings.
2017-03-25 22:23:40 +05:30
lethosor
aea76b7ef3
stockflow: make sure that manager order amounts are integers
...
Fixes #1044
2017-03-18 17:56:06 -04:00
lethosor
815bdb2e57
Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop
2017-03-18 00:51:37 -04:00
lethosor
f7f05724aa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2017-03-18 00:36:43 -04:00
lethosor
85e0daf15e
stonesense: basic 64-bit OS X support
2017-03-18 00:34:07 -04:00
lethosor
f17e9d3662
title-folder: fix SDL path on OS X
...
The Stonesense install script appears to do strange things which cause DF to
load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former
is loaded, loading the latter and calling SDL_WM_* functions from it will fail.
A better solution would be to remove parts of the Stonesense fix-libs-*.sh
script(s) that are causing this, since they don't appear to be needed, or
use dlsym() to find the already-opened library/symbols.
2017-03-18 00:31:25 -04:00
Japa
61c2fb0a11
Merged branch develop into develop
2017-03-18 00:26:01 +05:30
Japa
e60d8de5fe
Fix array out of bounds errors in remotefortressreader that were crashing linux.
2017-03-18 00:25:46 +05:30
lethosor
19695b4ee7
EventManager/eventful: Pass building ID pointers to event handlers
...
Previously, there was some disagreement over whether event handlers such as
Buildings::updateBuildings() took building pointers or building IDs shoved
into pointers. It turned out to be the latter, which, unfortunately, did not
compile on x64. Passing building IDs isn't possible in all cases, because
building event handlers can be called for recently-deleted buildings too.
Pointers to building IDs do work reliably, though.
Fixes #1003
2017-02-17 22:53:48 -05:00
lethosor
ae92ae7948
Merge remote-tracking branch 'JapaMala/creatureRenamer' into develop
2017-02-09 23:25:55 -05:00
Japa Illo
0d8decd7ec
Remove trailing whitespaces.
2017-02-08 10:54:42 +05:30
Japa Illo
2c19f6b237
remove rsize_t
2017-02-08 10:34:11 +05:30
Japa Illo
873feaee2b
Added a function to the creature renamer to save a graphics pack file to set graphics for all the generated creatures.
2017-02-07 15:57:35 +05:30
Japa Illo
10bbd3cb39
Added a function to spit out a generated graphics pack file. Not done yet.
2017-02-07 11:19:45 +05:30
Japa Illo
b151ad7c75
always make sure the name prefix has an underscore at the end of it.
2017-02-07 11:09:39 +05:30
Japa Illo
f9b296884c
Made the creature renamer work more than once on the same save, and changed the format of the resulting names.
2017-02-07 11:01:42 +05:30
Japa Illo
68faca09ee
Added missing base types given by toady, and reorganized the list to look better.
2017-02-07 10:27:57 +05:30
Japa Illo
64e217132e
Don't offset the raplacement by 1 since there's no space now.
2017-02-06 10:50:18 +05:30
Japa Illo
5b83c6fe68
Add spaces to search string programmatically.
2017-02-06 10:49:22 +05:30
Japa Illo
1aef1d1b98
use STD::Vector instead of a C array, and set version properly.
2017-02-06 10:42:10 +05:30
Japa Illo
b18bd72c05
Replace tab with spaces.
2017-02-06 10:12:20 +05:30
lethosor
7823d78cd9
Update xml and embark-tools field name
2017-02-04 14:49:21 -05:00
lethosor
f65a981099
Fix indentation
2017-02-04 14:46:38 -05:00
Japa Illo
c8e6845a7f
Send noble positions and professions along with Units.
2017-02-03 10:08:35 +05:30
Japa Illo
d97b0497b3
Add prosession and noble position info to units.
2017-02-02 12:12:28 +05:30
Japa Illo
c3c3f37b06
Added more descriptor types, and made it run on world load.
2017-01-26 15:58:43 +05:30
Japa Illo
24a653f77b
added ants and apes to the list.
2017-01-26 12:50:37 +05:30
Japa Illo
365624453e
Finish up the generated-creature-renamer plugin.
2017-01-26 12:45:40 +05:30
Japa
934d5b32bc
Fix creature listing and plugin name
2017-01-26 10:00:38 +05:30
Japa
c659b885b6
Start a plugin to rename generated creatures to have sensible IDs
2017-01-25 23:06:03 +05:30
Ben Rosser
f0d4a1f563
Add DOWNLOAD_RUBY option to Ruby plugin cmake, defaulting to ON
...
If DOWNLOAD_RUBY is set to OFF, the build will not attempt to download
a prebuilt libruby.so and not fire a warning that one is not present.
This may be desired if one wants to link dfhack against a newer system
libruby.so, now that dfhack supports ruby 2.x and also supports linking
against system libruby (at least, on Linux), as per the following commit:
df9b5bca73
This also allows the dfhack build to proceed without network access
(once all submodules have been fetched), which at least some Linux
distributions, like Fedora, require.
By default DOWNLOAD_RUBY is set to ON, so this should not change
the behavior of default builds.
I tested that when DOWNLOAD_RUBY is set to OFF, dfhack still launches
and that the Ruby plugin still functions, e.g. by running
```rb_eval puts('Hello world.')``` in the dfhack console.
2017-01-20 17:40:14 -05:00
lethosor
affcd658dc
title-version: Hide when loading a game (e.g. arena)
2017-01-04 12:30:59 -05:00
lethosor
cda4e7a300
title-version: add prerelease indicator
2016-12-30 18:03:28 -05:00
Kelly Kinkade
c99780aafd
Add support for shell crafts.
2016-12-27 23:40:53 -05:00
lethosor
cd0d9fed18
stocks: Support getSelectedItem()
2016-12-27 17:41:32 -05:00
Kelly Kinkade
3c7d2626e2
df::dfhack_material_category has no constructor, must be manually initialized
...
see #1047
2016-12-18 17:58:24 -06:00
Lethosor
ba48afe908
stockflow: Simplify calculation
...
See #1046
Use math.floor() for now until we can get Lua 5.3 working on Travis
2016-12-16 14:22:00 -05:00
Kelly Kinkade
1419d58b9a
stockflow: Use "floor division"
...
Per suggestion by @dscorbett
2016-12-16 13:04:51 -06:00
Kelly Kinkade
5be77fa63d
stockflow: Fix "integer expected" problem in stockflow
2016-12-16 08:09:53 -06:00
lethosor
a5eb5d2502
manipulator: Sort custom professions
...
Also use == instead of string::compare()
2016-12-15 19:18:07 -05:00
Kelly Kinkade
439e13643c
better hack to make ruby work on win64
2016-12-13 23:55:20 -06:00
lethosor
c8b7dbd255
Fix manipulator crash when selecting profession from empty list
...
Also add ListColumn::hasSelection()
Fixes #1040
2016-12-11 21:16:21 -05:00
lethosor
9e0221a44e
Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop
2016-12-11 17:52:00 -05:00
lethosor
e8c8953cbb
Re-add and update misery plugin
...
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
David Corbett
acdb369aa8
Avoid non-trivial bitfield constructors
2016-12-09 13:41:14 -05:00
lethosor
0c6c94b310
Merge branch 'develop' of gh:dfhack/dfhack into develop
2016-12-09 11:28:09 -05:00
lethosor
d6fda58ca0
Remove treefarm (PR #1011 )
...
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'
advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
2016-12-09 11:20:35 -05:00
Lethosor
1545a4106b
Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix StoreItemInVehicle labor inference
2016-12-09 11:07:00 -05:00
Kelly Kinkade
1a9d8629c5
labormanager: fix StoreItemInVehicle labor inference ( #8 )
...
* labormanager: add deconstruct labor for constructed instruments
* labormanager: fix StoreItemInVehicle labor inference
StoreItemInVehicle requires the labor appropriate to the item being
stashed
2016-12-09 09:54:20 -06:00
Lethosor
8012c5686b
Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1
...
labormanager: add deconstruct labor for constructed instruments
2016-12-08 17:15:04 -05:00
Kelly Kinkade
50ce9942f4
labormanager: add deconstruct labor for constructed instruments ( #7 )
2016-12-08 16:01:14 -06:00
jj
8488b1a953
ruby: use correct raw string length with encodings
2016-12-05 10:29:16 +01:00
Lethosor
eaf9b75a18
Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix deconstruction of buildings containing items
2016-12-01 18:41:10 -05:00
Kelly Kinkade
1eaa2033dc
Merge pull request #6 from ab9rf/labormanager-0.43.03-working
...
further tweak building construction labor identification
2016-12-01 14:38:21 -06:00
Kelly Kinkade
ad6d6fbaa6
further tweak building construction labor identification
...
It's always more complicated than you expect....
2016-12-01 14:36:46 -06:00
Kelly Kinkade
1fa997612f
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
...
Mysteriously disappearing code reinserted
2016-12-01 11:12:39 -06:00
Kelly Kinkade
1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
Kelly Kinkade
6856a7ebe0
Merge pull request #4 from ab9rf/labormanager-0.43.03-working
...
Fix deconstruction of buildings containing items
2016-12-01 11:07:36 -06:00
Kelly Kinkade
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
Lethosor
ddf447d3de
Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1
...
Use attributes in calculating assignment weight
2016-11-29 01:51:56 -05:00
Kelly Kinkade
0ab3005a89
Merge pull request #3 from ab9rf/labormanager-0.43.03-working
...
Incorporate more updates cherrypicked from nocico
2016-11-29 00:24:31 -06:00
Kelly Kinkade
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
nocico
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
nocico
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
Kelly Kinkade
7c0fecec14
Merge pull request #2 from ab9rf/labormanager-0.43.03-working
...
Pull working changes forward to 0.43.05
2016-11-27 22:53:29 -06:00
nocico
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
nocico
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
nocico
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
nocico
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
Kelly Kinkade
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
Kelly Kinkade
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
Kelly Kinkade
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
Kelly Kinkade
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
Kelly Kinkade
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
nocico
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
lethosor
dd28079f30
Fix ruby.cpp compilation on win64
2016-11-22 22:43:48 -05:00
lethosor
c7a35d7ece
fix remotefortressreader protobuf error in clean builds
2016-11-22 17:24:36 -05:00
lethosor
647ef4d556
Fix labormanager whitespace
2016-11-22 17:17:56 -05:00
lethosor
45d138191e
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-11-17 23:02:05 -05:00
lethosor
df9b5bca73
Allow ruby plugin to try more than one library path, including libruby.so on Linux
2016-11-17 10:31:48 -05:00
lethosor
dce00a5034
Partial compilation fixes for advtools, misery
2016-11-16 15:21:13 -05:00
lethosor
8d9b888410
Revert "fixed MD5 hash of win64 ruby lib."
...
Unable to get anything other than 8a856 for the extracted library on my end
This reverts commit fbaf2697cb
.
2016-11-14 14:16:43 -05:00
Kelly Kinkade
80ff369059
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-11-08 12:07:30 -06:00
Kelly Kinkade
8fec45696d
Better job assignment algorithm for labormanager.
2016-11-08 12:01:24 -06:00
Japa Illo
6895f3fbed
remove tabs
2016-11-08 15:13:43 +05:30
Japa Illo
5e204069ce
update stonesense
2016-11-08 15:13:06 +05:30
Japa Illo
20b9aab8db
moved remotefortressreader.cpp to its own directory.
2016-11-08 15:11:27 +05:30
Japa Illo
fbaf2697cb
fixed MD5 hash of win64 ruby lib.
2016-11-08 15:10:43 +05:30
Japa Illo
2935032a1e
Add .proto files to plugin sources when used, to make it conventient to open it from the IDE.
2016-11-08 15:10:01 +05:30
Japa
ebc1a6d85e
Add functions to get and set the pause state in DF
2016-11-08 13:40:08 +05:30
Japa Illo
99051f176b
Add a single bool dfproto message, to pausing and checking pause state
2016-11-06 10:08:28 +05:30
lethosor
939b177673
Merge branch 'develop' of dfhack/dfhack into develop
2016-11-02 16:26:33 -04:00
lethosor
04ad7a0a42
Replace some instances of "cmake -E copy_if_different" with a standalone script
...
@JapaMala reported that CMake < 3.5 doesn't support copy_if_different with
multiple source files.
https://cmake.org/cmake/help/v3.5/release/3.5.html#command-line
2016-11-02 16:23:32 -04:00
Japa
e769041983
Fix crash bug in remotefortressreader, that happened every time the user resumed.
2016-11-01 23:34:56 +05:30
Japa
a50af3e96c
Update stonesense
2016-10-31 22:52:45 +05:30
Japa
d8f3d7d8f9
Send dye color with items in remotefortressreader.cpp
2016-10-31 22:52:17 +05:30
Japa
8a66e22522
Merged branch develop into develop
2016-10-31 17:39:02 +05:30
Japa
335607d1f8
Update Stonesense.
2016-10-31 17:38:43 +05:30
lethosor
2e6c7a90be
fix whitespace
2016-10-31 01:58:40 -04:00
lethosor
30f4617abf
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-10-31 01:56:49 -04:00
lethosor
9e97ccbb50
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
2016-10-29 19:08:54 -04:00
lethosor
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
lethosor
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
Jon Pamala Illo
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
Jon Pamala Illo
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
lethosor
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
lethosor
ec222c0b24
Catch exceptions in stockpile (un)serialization
...
From #964 , protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).
Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
2016-10-29 02:35:27 -04:00
Japa
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
Japa
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
Japa
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
jj
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
PeridexisErrant
cdf24efe43
Remove plugins - all broken since 34.11
...
This changes nothing at all as far as any DFHack user is concerned, as
these plugins have not been possible to build since DF 34.11 - and would
have to be rewritten for compatiblity with new native-DF systems.
"treefarm" is additionally replaced by "autochop".
In the unlikely event that a developer wants the source code for
something... that's what version control is for!
2016-10-27 23:35:29 +11:00
lethosor
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
lethosor
cf329c7ceb
Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x
...
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
2016-10-26 20:44:35 -04:00
lethosor
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
Kelly Kinkade
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
Kelly Kinkade
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
Kelly Kinkade
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
Kelly Kinkade
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
Kelly Kinkade
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
lethosor
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
lethosor
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
lethosor
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
Japa
25a64a2102
Merged branch develop into develop
2016-10-21 22:55:38 +05:30
Japa
a0b0c16a8b
Actually apply the designation changes in RemoteFortressReader
2016-10-21 22:55:28 +05:30
lethosor
3df74de021
Fix rb_dfget_vtable_ptr on x64
...
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
2016-10-21 11:46:53 -04:00
jj
97f29229cd
ruby: fix weird freeze when printing large strings to the console on linux64
2016-10-21 17:00:02 +02:00
jj
f586692ed6
plugins/ruby: update for 64bits
2016-10-21 14:52:26 +02:00
lethosor
e3ff89ba03
Fix compile error
2016-10-19 16:21:38 -04:00
Japa
701adc12b3
Add ability for remotefortressreader.cpp to accept dig designations.
2016-10-19 22:21:50 +05:30
Japa
919507d9a0
Send over dig designations from un-taken job postings in remotefortressreader.cpp.
2016-10-19 20:00:30 +05:30
lethosor
16c77efb43
Fix whitespace issues
2016-10-15 16:05:33 -04:00
lethosor
4c21bbd5ae
Add Lua::TableInsert() helper
2016-10-15 14:55:48 -04:00
lethosor
8a138fcc4c
Avoid polluting global namespace in MapCache.h
2016-10-15 14:53:10 -04:00
Japa
8d84b0d968
Merged branch v0.43.03 into develop
2016-10-13 19:27:06 +05:30
lethosor
1c20ebe62c
Make title-folder work without SDL_WM_GetCaption
2016-10-08 17:02:45 -04:00
lethosor
2806fe73a9
ruby: Support for loading Ruby 2.x libruby
...
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
2016-10-08 17:01:52 -04:00
Japa
58ed20b25b
Send world map snow coverage over remotefortressreader.
2016-10-06 22:16:40 +05:30
lethosor
714ba1a030
Warn if ruby library is missing instead of breaking installation
2016-09-26 18:28:59 -04:00
lethosor
caa6a81669
Add ruby library for linux x64
...
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989
Closes dfhack/dfhack#989
2016-09-26 17:46:50 -04:00
lethosor
7abb82b6d1
Switch to downloading 32-bit libruby on Linux and Windows
2016-09-26 17:36:57 -04:00
lethosor
888a09bed5
Switch to downloading OS X libruby
2016-09-26 17:24:35 -04:00
lethosor
8f2cc5bc4d
Fix and reorganize remotefortressreader includes
2016-09-04 16:06:26 -04:00
Japa
e205dc82a5
Merge pull request #991 from JapaMala/v0.43.03
...
Removed the other foreach.
2016-08-29 22:30:43 +05:30
Japa
1862106fd1
Removed the other foreach.
2016-08-29 22:29:40 +05:30
Japa
b09ee3407c
Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
...
Conflicts:
library/xml
plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
Japa
af5d4ec5a8
removed foreach.
2016-08-29 21:43:20 +05:30
lethosor
bbaf129adf
Fix ruby codegen for bitfields/enums with long base-type
2016-08-27 15:24:53 -04:00
Japa
7d145de4a7
Translate histfig mats into creature mats, rather than sending the entire histfig population.
2016-08-26 23:48:32 +05:30
Japa
91cb734a25
Send histfig materials over remotefortressreader.cpp, using unique ids.
2016-08-26 12:23:50 +05:30
Japa
5c3260c382
Actually check spatter amounts properly
2016-08-26 08:49:54 +05:30
Japa
db7be082ef
Only copy spatters if they actually have any amount.
2016-08-25 23:56:30 +05:30
Japa
a3ab757642
Add spatters to remotefortressreader.cpp
2016-08-25 21:14:23 +05:30
lethosor
6ce470ad57
Add basic lua expression support to memview
...
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.
Closes #976
2016-08-24 16:26:34 -04:00
lethosor
f4b0c2fcfc
color-dfhack-text: Fix potential overflow issue
2016-08-22 23:18:58 -04:00
lethosor
93ac937cb9
Add new job types to autohauler
2016-08-21 22:24:41 -04:00
lethosor
9171149afb
Update submodule refs
2016-08-18 23:42:17 -04:00
lethosor
de731b0299
Move save_dir back into cur_savegame and update submodules
2016-08-14 12:41:09 -04:00
lethosor
e965f5318f
Replace many includes with forward declarations in modules/Maps.h
2016-08-13 21:44:01 -04:00
lethosor
a1c25570df
Move labormanager to plugins/, per request
2016-08-11 23:49:15 -04:00
lethosor
99813038e9
Update labormanager for unit.relations removal and fix warnings
2016-08-11 23:42:58 -04:00
lethosor
bceeea39ba
Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop
2016-08-11 23:37:22 -04:00
Kelly Kinkade
a55ce5f1d9
labormanager: whitespace
2016-08-11 16:58:35 -05:00
Kelly Kinkade
5ab930ba4d
labormanager: small tweaks
...
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
2016-08-11 16:56:34 -05:00
lethosor
215afa34f3
Update for 64-bit unit changes
...
Includes xml, stonesense, scripts
Ref DFHack/df-structures@25cb373
2016-08-10 23:50:00 -04:00
lethosor
1b11c46a98
ruby.cpp: uint32_t -> uintptr_t
2016-08-10 15:24:07 -04:00
Lethosor
6e741b1a80
Merge pull request #969 from Qartar/win64
...
Minor fixes/updates for Visual Studio 2015 Win64
2016-08-10 15:15:44 -04:00
lethosor
53a0d73d23
Add new title-folder plugin
2016-08-09 20:09:50 -04:00
Carter Bray
5fef2ad075
Add windows container sizes to ruby codegen
2016-08-07 10:11:17 -07:00
lethosor
ddbb1b5bb8
ruby: Update sizes for some types
...
Many are still incomplete on x64, especially on Windows
2016-08-05 17:29:24 -04:00
lethosor
dbd2e71920
Ruby codegen integer improvements
...
- Add uint64_t
- Add special case for long on different platforms
- Require OS and architecture to be specified
NOTE: integer alignment on x64 is probably still incorrect
2016-08-05 17:12:07 -04:00
lethosor
ef569dc5a1
Pass OS and architecture to ruby codegen explicitly
...
- Passing the architecture is needed to determine sizeof(long)
- Passing the OS prevents potential issues when cross-compiling between Windows
and non-Windows (although this is unlikely)
2016-08-05 17:09:25 -04:00
Japa
697aa54fa6
Sent tree and stone layers through remotefortressreader.cpp, and correct town placement.
2016-08-05 00:40:10 +05:30
Japa
8a97b54bcd
Send wall info
2016-08-03 16:32:51 +05:30
Japa
2fda01d90b
Add support for site towers.
2016-08-03 10:22:30 +05:30
Japa
9189e3dc7e
Send world buildings through remotefortressreader.cpp
2016-08-02 10:30:17 +05:30
Carter Bray
9da2dcb8a2
Fix raw_vcall on Win64 builds
...
MSVC's call conventions on x64 are the same for normal function calls and
member function calls (with the addition of the implicit 'this'
parameter).
2016-07-31 17:01:57 -07:00
lethosor
79377669a1
Merge remote-tracking branch 'NCommander/dwarfvet' into develop
2016-07-29 16:25:53 -04:00
lethosor
afde73a673
memview: Fix pointer size on x64
2016-07-28 11:45:35 -04:00
lethosor
eeb7f05483
vectors: Fix pointer parsing and display
2016-07-28 11:44:54 -04:00
lethosor
71e4f4ec62
Fix pointer-size-related compile errors in dev plugins
2016-07-28 11:40:17 -04:00
Japa
98230e9078
Send surface material with the worldmap in remotefortressreader.cpp
2016-07-28 20:52:14 +05:30
Vitaly Pronkin
8916aba3bf
win64 fixes (partial)
...
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
Vitaly Pronkin
fe18f176f7
More 64-bit fixes
...
Cherry-picked from 7eb3ba6
- Lua update already done in e2c6350
, 4dd411e
- Excluded library/modules/Buildings.cpp
2016-07-26 23:47:53 -04:00
Kelly Kinkade
74f6f3d416
labormanager: add labors for bookcase (de)construct
2016-07-11 22:39:41 -05:00