bbaf3210f1
Send DF version info over remoteFortressReader
2017-03-29 21:58:12 +05:30
c244901c16
Removed end of line space. (Sorry, travis)
2017-03-29 20:22:09 +05:30
19a253c132
Merge remote-tracking branch 'DFHack/develop' into develop
2017-03-29 19:46:55 +05:30
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
5ea964b9cf
Send building items with buildings.
2017-03-25 22:23:40 +05:30
aea76b7ef3
stockflow: make sure that manager order amounts are integers
...
Fixes #1044
2017-03-18 17:56:06 -04:00
815bdb2e57
Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop
2017-03-18 00:51:37 -04:00
f7f05724aa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2017-03-18 00:36:43 -04:00
85e0daf15e
stonesense: basic 64-bit OS X support
2017-03-18 00:34:07 -04:00
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
61c2fb0a11
Merged branch develop into develop
2017-03-18 00:26:01 +05:30
e60d8de5fe
Fix array out of bounds errors in remotefortressreader that were crashing linux.
2017-03-18 00:25:46 +05:30
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
ae92ae7948
Merge remote-tracking branch 'JapaMala/creatureRenamer' into develop
2017-02-09 23:25:55 -05:00
0d8decd7ec
Remove trailing whitespaces.
2017-02-08 10:54:42 +05:30
2c19f6b237
remove rsize_t
2017-02-08 10:34:11 +05:30
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
10bbd3cb39
Added a function to spit out a generated graphics pack file. Not done yet.
2017-02-07 11:19:45 +05:30
b151ad7c75
always make sure the name prefix has an underscore at the end of it.
2017-02-07 11:09:39 +05:30
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
68faca09ee
Added missing base types given by toady, and reorganized the list to look better.
2017-02-07 10:27:57 +05:30
64e217132e
Don't offset the raplacement by 1 since there's no space now.
2017-02-06 10:50:18 +05:30
5b83c6fe68
Add spaces to search string programmatically.
2017-02-06 10:49:22 +05:30
1aef1d1b98
use STD::Vector instead of a C array, and set version properly.
2017-02-06 10:42:10 +05:30
b18bd72c05
Replace tab with spaces.
2017-02-06 10:12:20 +05:30
7823d78cd9
Update xml and embark-tools field name
2017-02-04 14:49:21 -05:00
f65a981099
Fix indentation
2017-02-04 14:46:38 -05:00
c8e6845a7f
Send noble positions and professions along with Units.
2017-02-03 10:08:35 +05:30
d97b0497b3
Add prosession and noble position info to units.
2017-02-02 12:12:28 +05:30
c3c3f37b06
Added more descriptor types, and made it run on world load.
2017-01-26 15:58:43 +05:30
24a653f77b
added ants and apes to the list.
2017-01-26 12:50:37 +05:30
365624453e
Finish up the generated-creature-renamer plugin.
2017-01-26 12:45:40 +05:30
934d5b32bc
Fix creature listing and plugin name
2017-01-26 10:00:38 +05:30
c659b885b6
Start a plugin to rename generated creatures to have sensible IDs
2017-01-25 23:06:03 +05:30
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
2017-01-20 17:40:14 -05:00
affcd658dc
title-version: Hide when loading a game (e.g. arena)
2017-01-04 12:30:59 -05:00
cda4e7a300
title-version: add prerelease indicator
2016-12-30 18:03:28 -05:00
c99780aafd
Add support for shell crafts.
2016-12-27 23:40:53 -05:00
cd0d9fed18
stocks: Support getSelectedItem()
2016-12-27 17:41:32 -05:00
3c7d2626e2
df::dfhack_material_category has no constructor, must be manually initialized
...
see #1047
2016-12-18 17:58:24 -06:00
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
1419d58b9a
stockflow: Use "floor division"
...
Per suggestion by @dscorbett
2016-12-16 13:04:51 -06:00
5be77fa63d
stockflow: Fix "integer expected" problem in stockflow
2016-12-16 08:09:53 -06:00
a5eb5d2502
manipulator: Sort custom professions
...
Also use == instead of string::compare()
2016-12-15 19:18:07 -05:00
439e13643c
better hack to make ruby work on win64
2016-12-13 23:55:20 -06:00
c8b7dbd255
Fix manipulator crash when selecting profession from empty list
...
Also add ListColumn::hasSelection()
Fixes #1040
2016-12-11 21:16:21 -05:00
9e0221a44e
Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop
2016-12-11 17:52:00 -05:00
e8c8953cbb
Re-add and update misery plugin
...
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
acdb369aa8
Avoid non-trivial bitfield constructors
2016-12-09 13:41:14 -05:00
0c6c94b310
Merge branch 'develop' of gh:dfhack/dfhack into develop
2016-12-09 11:28:09 -05:00
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
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
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
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
50ce9942f4
labormanager: add deconstruct labor for constructed instruments ( #7 )
2016-12-08 16:01:14 -06:00
8488b1a953
ruby: use correct raw string length with encodings
2016-12-05 10:29:16 +01:00
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
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
ad6d6fbaa6
further tweak building construction labor identification
...
It's always more complicated than you expect....
2016-12-01 14:36:46 -06:00
1fa997612f
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
...
Mysteriously disappearing code reinserted
2016-12-01 11:12:39 -06:00
1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
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
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
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
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
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
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
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
dd28079f30
Fix ruby.cpp compilation on win64
2016-11-22 22:43:48 -05:00
c7a35d7ece
fix remotefortressreader protobuf error in clean builds
2016-11-22 17:24:36 -05:00
647ef4d556
Fix labormanager whitespace
2016-11-22 17:17:56 -05:00
45d138191e
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-11-17 23:02:05 -05:00
df9b5bca73
Allow ruby plugin to try more than one library path, including libruby.so on Linux
2016-11-17 10:31:48 -05:00
dce00a5034
Partial compilation fixes for advtools, misery
2016-11-16 15:21:13 -05:00
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
80ff369059
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-11-08 12:07:30 -06:00
8fec45696d
Better job assignment algorithm for labormanager.
2016-11-08 12:01:24 -06:00
6895f3fbed
remove tabs
2016-11-08 15:13:43 +05:30
5e204069ce
update stonesense
2016-11-08 15:13:06 +05:30
20b9aab8db
moved remotefortressreader.cpp to its own directory.
2016-11-08 15:11:27 +05:30
fbaf2697cb
fixed MD5 hash of win64 ruby lib.
2016-11-08 15:10:43 +05:30
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
ebc1a6d85e
Add functions to get and set the pause state in DF
2016-11-08 13:40:08 +05:30
99051f176b
Add a single bool dfproto message, to pausing and checking pause state
2016-11-06 10:08:28 +05:30
939b177673
Merge branch 'develop' of dfhack/dfhack into develop
2016-11-02 16:26:33 -04:00
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
e769041983
Fix crash bug in remotefortressreader, that happened every time the user resumed.
2016-11-01 23:34:56 +05:30
a50af3e96c
Update stonesense
2016-10-31 22:52:45 +05:30
d8f3d7d8f9
Send dye color with items in remotefortressreader.cpp
2016-10-31 22:52:17 +05:30
8a66e22522
Merged branch develop into develop
2016-10-31 17:39:02 +05:30
335607d1f8
Update Stonesense.
2016-10-31 17:38:43 +05:30
2e6c7a90be
fix whitespace
2016-10-31 01:58:40 -04:00
30f4617abf
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-10-31 01:56:49 -04:00
9e97ccbb50
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
2016-10-29 19:08:54 -04:00
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
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
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
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
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
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
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
25a64a2102
Merged branch develop into develop
2016-10-21 22:55:38 +05:30
a0b0c16a8b
Actually apply the designation changes in RemoteFortressReader
2016-10-21 22:55:28 +05:30
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
97f29229cd
ruby: fix weird freeze when printing large strings to the console on linux64
2016-10-21 17:00:02 +02:00
f586692ed6
plugins/ruby: update for 64bits
2016-10-21 14:52:26 +02:00
e3ff89ba03
Fix compile error
2016-10-19 16:21:38 -04:00
701adc12b3
Add ability for remotefortressreader.cpp to accept dig designations.
2016-10-19 22:21:50 +05:30
919507d9a0
Send over dig designations from un-taken job postings in remotefortressreader.cpp.
2016-10-19 20:00:30 +05:30
16c77efb43
Fix whitespace issues
2016-10-15 16:05:33 -04:00
4c21bbd5ae
Add Lua::TableInsert() helper
2016-10-15 14:55:48 -04:00
8a138fcc4c
Avoid polluting global namespace in MapCache.h
2016-10-15 14:53:10 -04:00
8d84b0d968
Merged branch v0.43.03 into develop
2016-10-13 19:27:06 +05:30
1c20ebe62c
Make title-folder work without SDL_WM_GetCaption
2016-10-08 17:02:45 -04:00
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
58ed20b25b
Send world map snow coverage over remotefortressreader.
2016-10-06 22:16:40 +05:30
714ba1a030
Warn if ruby library is missing instead of breaking installation
2016-09-26 18:28:59 -04:00
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
7abb82b6d1
Switch to downloading 32-bit libruby on Linux and Windows
2016-09-26 17:36:57 -04:00
888a09bed5
Switch to downloading OS X libruby
2016-09-26 17:24:35 -04:00
8f2cc5bc4d
Fix and reorganize remotefortressreader includes
2016-09-04 16:06:26 -04:00
e205dc82a5
Merge pull request #991 from JapaMala/v0.43.03
...
Removed the other foreach.
2016-08-29 22:30:43 +05:30
1862106fd1
Removed the other foreach.
2016-08-29 22:29:40 +05:30
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
af5d4ec5a8
removed foreach.
2016-08-29 21:43:20 +05:30
bbaf129adf
Fix ruby codegen for bitfields/enums with long base-type
2016-08-27 15:24:53 -04:00
7d145de4a7
Translate histfig mats into creature mats, rather than sending the entire histfig population.
2016-08-26 23:48:32 +05:30
91cb734a25
Send histfig materials over remotefortressreader.cpp, using unique ids.
2016-08-26 12:23:50 +05:30
5c3260c382
Actually check spatter amounts properly
2016-08-26 08:49:54 +05:30
db7be082ef
Only copy spatters if they actually have any amount.
2016-08-25 23:56:30 +05:30
a3ab757642
Add spatters to remotefortressreader.cpp
2016-08-25 21:14:23 +05:30
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
f4b0c2fcfc
color-dfhack-text: Fix potential overflow issue
2016-08-22 23:18:58 -04:00
93ac937cb9
Add new job types to autohauler
2016-08-21 22:24:41 -04:00
9171149afb
Update submodule refs
2016-08-18 23:42:17 -04:00
de731b0299
Move save_dir back into cur_savegame and update submodules
2016-08-14 12:41:09 -04:00
e965f5318f
Replace many includes with forward declarations in modules/Maps.h
2016-08-13 21:44:01 -04:00
a1c25570df
Move labormanager to plugins/, per request
2016-08-11 23:49:15 -04:00
99813038e9
Update labormanager for unit.relations removal and fix warnings
2016-08-11 23:42:58 -04:00
bceeea39ba
Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop
2016-08-11 23:37:22 -04:00
a55ce5f1d9
labormanager: whitespace
2016-08-11 16:58:35 -05:00
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
215afa34f3
Update for 64-bit unit changes
...
Includes xml, stonesense, scripts
Ref DFHack/df-structures@25cb373
2016-08-10 23:50:00 -04:00
1b11c46a98
ruby.cpp: uint32_t -> uintptr_t
2016-08-10 15:24:07 -04:00
6e741b1a80
Merge pull request #969 from Qartar/win64
...
Minor fixes/updates for Visual Studio 2015 Win64
2016-08-10 15:15:44 -04:00
53a0d73d23
Add new title-folder plugin
2016-08-09 20:09:50 -04:00
5fef2ad075
Add windows container sizes to ruby codegen
2016-08-07 10:11:17 -07:00
ddbb1b5bb8
ruby: Update sizes for some types
...
Many are still incomplete on x64, especially on Windows
2016-08-05 17:29:24 -04:00
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
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
697aa54fa6
Sent tree and stone layers through remotefortressreader.cpp, and correct town placement.
2016-08-05 00:40:10 +05:30
8a97b54bcd
Send wall info
2016-08-03 16:32:51 +05:30
2fda01d90b
Add support for site towers.
2016-08-03 10:22:30 +05:30
9189e3dc7e
Send world buildings through remotefortressreader.cpp
2016-08-02 10:30:17 +05:30
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
79377669a1
Merge remote-tracking branch 'NCommander/dwarfvet' into develop
2016-07-29 16:25:53 -04:00
afde73a673
memview: Fix pointer size on x64
2016-07-28 11:45:35 -04:00
eeb7f05483
vectors: Fix pointer parsing and display
2016-07-28 11:44:54 -04:00
71e4f4ec62
Fix pointer-size-related compile errors in dev plugins
2016-07-28 11:40:17 -04:00
98230e9078
Send surface material with the worldmap in remotefortressreader.cpp
2016-07-28 20:52:14 +05:30
8916aba3bf
win64 fixes (partial)
...
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
fe18f176f7
More 64-bit fixes
...
Cherry-picked from 7eb3ba6
- Lua update already done in e2c63504dd411e
2016-07-26 23:47:53 -04:00
74f6f3d416
labormanager: add labors for bookcase (de)construct
2016-07-11 22:39:41 -05:00
874a97ed9f
labormanager: fix several job-to-labor mappings
2016-07-11 22:39:41 -05:00
808afca9f0
labormanager: add StoreItemInLocation labor, reduce tool churn
...
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
2016-07-11 22:39:41 -05:00
0509c455dd
labormanager: significant restructuring to use job posting list
...
Updated here to get potential jobs off the job posting lists, which is
apparently where certain map-designated live after being designated but
before they move to the actual job list. Also changes to how tools are
handled, and lever pulling is assigned by default to all idle dwarfs.
2016-07-11 22:39:41 -05:00
3a0ba332d9
labormanager: rework for better behavior with 43.03
...
The main thing here is that the process loop exits if the DF process_job
or process_dig flags are set since if these are set the job list is
going to change soon anyway. The plugin also sets these flags when it
changes any labors, which has the side effect of effectively disabling
the process loop while DF is paused, which prevents flapping while
editing job preferences in-game, and also allows changing job
preferences in game (although such changes may not last when the clock
starts up again).
2016-07-11 22:39:41 -05:00
dbc46c510f
labormanager: fix stupid
2016-07-11 22:39:41 -05:00
705134975d
labormanager: whitespace
...
MSVC is evil.
2016-07-11 22:39:41 -05:00
f095e139aa
labormanager: more tweaks to bring up to date
...
This update fixes some labors and attempts to address changes in the way
DF maintains the job list.
2016-07-11 22:39:41 -05:00
07e1c81969
labormanager improvements
...
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
2016-07-11 22:39:41 -05:00
824275b23b
Rename autolabor2 to labormanager and bring up to date with current
2016-07-11 22:39:41 -05:00
2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
13b328beeb
Remove tabs
2016-06-30 15:14:20 +05:30
b37afa4591
Remove tabs
2016-06-30 15:12:28 +05:30
b196ecf351
Send over material tissues through RemoteFortressReader
2016-06-30 14:33:15 +05:30
421e7949e0
Merge pull request #951 from eswald/stockflow-43
...
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
060331de37
Stockflow reaction updates
...
SpinThread jobs now get the proper material category flag, and metal mechanisms can be ordered.
2016-06-26 19:22:53 -06:00
036c0f787c
Send creature adult size through remotefortressreader.cpp
2016-06-23 21:26:00 +05:30
74c9abcb47
Send color modifier raws through remotefortressreader.cpp
2016-06-22 13:36:36 +05:30
069d6b67d6
Send all size modifiers through remotefortressreader.
2016-06-21 22:42:47 +05:30
5fff0efec5
Send appearance info over remotefortressreader.cpp
2016-06-20 22:59:59 +05:30
9ef9a6b519
Send bodypart raws from RemoteFortressReader
2016-06-20 13:21:11 +05:30
980be6e2af
Added a cleaner format for sending over region info.
2016-06-16 21:36:35 +05:30
39c96c474a
Fix ordering, news, and indentation
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-14 16:13:26 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
9021fcab2e
Merge pull request #946 from NCommander/fix-produce-structure
...
Modify DFHack to handle new produce() prototype. Major thanks to leth…
2016-06-13 17:24:22 -04:00
a03b32846a
Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 16:57:45 -04:00
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
fead8a80ff
Fix tabs to spaces
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:03 -04:00
e45fbfc61d
Modified dwaftvet plugin to work with latest DFHack
...
Initial commit of the dwarfvet plugin
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:14:59 -04:00
8543121ece
add fog of war and traffic to probe.cpp
2016-06-03 00:32:11 +05:30
44b8433282
Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer
2016-06-03 00:31:02 +05:30
b1072b65e4
Don't send designations in adventure mode
2016-05-31 22:53:48 +05:30
3dcd3e14f0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-05-28 21:24:02 +05:30
569325823d
Send world name and time with world center in remotefortressreader.cpp
2016-05-28 21:23:26 +05:30
0867f3d311
Add dig designations to probe.cpp
2016-05-28 08:29:12 +05:30
c0419d919e
Add lake levels to remotefortressreader.cpp
2016-05-28 08:28:17 +05:30
9be928541c
Include math.h
...
3dveins.cpp won't build for me without math.h as a dependency - errors about 'fabsf' and other math functions
arch linux, gcc-multilib 6.1.1-1
2016-05-22 16:45:58 -04:00
dabf443260
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-17 23:29:01 -04:00
d198bf547a
Unit list search: reset cursor position to 0 before switching pages
...
On empty lists, pressing "up" sets the cursor position to -1. This results in a
crash if the list is populated, which the search plugin does before switching
pages.
Fixes #928
2016-05-17 23:23:54 -04:00
3f0857bff3
Incrementing the manager order id properly.
...
There's a chance that not doing so could lead to a crash, somehow.
2016-05-16 19:48:52 -06:00
a8f9f912c9
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-16 20:40:50 -04:00
11a0bea002
Moving a search option to the bottom of the screen.
...
The list of workers in the workshop profile page can take nearly the full height of the screen.
2016-05-15 22:49:35 -06:00
2df41e6bad
Clearing the active flag for new stockflow orders.
...
It's not entirely clear what this flag does when there aren't any conditions on the order, but new manual orders start as Ready instead of Active.
2016-05-15 22:06:20 -06:00
0b1004f2b8
Notice resizing immediately, instead of on next key press
2016-05-15 09:14:30 -06:00
6add87b358
Simplifying key strings
2016-05-15 08:58:45 -06:00
6575f5f412
Removing the quantity limit on stockflow orders.
2016-05-14 23:40:01 -06:00
3e8d4f9257
New command for clearing the stockpile order.
...
Shift-Space by default, using the SETUPGAME_SAVE_PROFILE_ABORT key.
2016-05-14 23:35:07 -06:00
8c7d5366c9
Switching to the new manager order flags
2016-05-14 23:33:38 -06:00
02e0b9e721
Manager interface now uses the full height.
...
Its navigation behavior has also changed, and it now has key hints for navigation.
2016-05-14 22:42:49 -06:00
3af24507a3
adjust autogems to work with the workshop profile changes
2016-05-14 20:15:49 -05:00
55e58e5f06
Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins
2016-05-14 11:43:37 -04:00
74898a5424
createitem: move all created items to cursor if applicable
2016-05-11 17:54:37 -04:00
38051a5a48
remove tweak manager-quantity
2016-05-11 17:51:57 -04:00
e0a0a26739
ANY_GENERIC35 -> 36
2016-05-10 17:57:15 -04:00
d93cbd709e
Merge remote-tracking branches 'warmist/fixpositions', 'warmist/gm_editor_changes', 'rubybrowncoat/feature/fix-multiquality-gui-create-item' and 'AtomicChicken/item-trigger-fix' into develop
2016-05-09 20:55:14 -04:00
56f2603097
Send over rivers through remotefortressreader.cpp
2016-05-02 20:58:36 +05:30
b8f5496b24
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-25 22:39:18 +05:30
572d38e3db
Made remotefortressreader.cpp return the correct area of interest in the world when on the embark screen.
2016-04-25 22:38:47 +05:30
f66dd77a72
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-04-23 20:33:25 -04:00
5418233117
to_string -> int_to_string
2016-04-22 20:27:53 -04:00
fd54003384
More make_pair replacements
2016-04-22 20:26:07 -04:00
ec42967996
Use std::make_pair instead of initializer lists
2016-04-22 19:43:05 -04:00
8784a133e8
Initialize maps in a MSVC 2010-compatible way
2016-04-22 18:45:32 -04:00
52728babd4
Merge branch 'develop' into zone-unassign
2016-04-22 18:41:15 -04:00
acac839371
Replace fixdiplomats, fixmerchants with scripts
2016-04-20 11:12:06 +10:00
856c3b06f4
Added dig designations to remotefortressreader.cpp
2016-04-19 19:15:33 +05:30
1317792cde
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-19 18:17:39 +05:30
50f2851772
Merge pull request #742 from PeridexisErrant/ls-cleanup
...
Ls cleanup
2016-04-17 17:59:22 -04:00
8226134f67
Make can_trade() return true if at least one caravan can trade
...
Fixes #900
2016-04-16 17:13:00 -04:00
ae81454786
Minor fixes, space no longer required
...
Thanks to 2882422
2016-04-15 16:28:41 +10:00
273c22f606
Shorten "ls" help for plugins
...
I think that's all of them.
2016-04-15 16:28:41 +10:00
0d37209063
use trade_state enum
2016-04-13 09:44:57 -04:00
a92b67c80d
Add ability to edit min/max logs and remove cap
...
Closes #893
2016-04-12 19:52:51 -04:00
999d89c5af
Fix tile background colors in CopyScreen
2016-04-12 17:10:54 -04:00
daadc2ef85
Update stonesense
2016-04-10 20:11:52 -04:00
2399539990
Merge remote-tracking branches 'warmist/patch-7', 'warmist/patch-8' and 'warmist/patch-9' into develop
2016-04-10 11:58:48 -04:00
812f6df272
Fix building-hacks color for auto_gears option
...
Now it should select the gear color correctly
2016-04-10 16:55:08 +03:00
c4c452c288
Show sidebar when moving from screen to screen
...
When both are from lua the old logic failed.
2016-04-10 16:51:58 +03:00
29f08cd20d
Fix eventful trying to show sidebar
...
It should not try to do that if e.g. showing buildingitems. Maybe later we will have more valid focus strings (e.g. custom item view for some buildings) but for now just use vanilla (or callback function not a class)
2016-04-10 14:58:03 +03:00
9c9f710d5b
Fix eventful not showing sidebar sometimes
...
E.g. when destroying buildings
2016-04-10 14:47:33 +03:00
4c4b727a2e
Update stonesense
2016-04-09 20:09:41 -04:00
33472b823b
createitem: fall back to units.active[0] if a cursor is available but no unit
2016-04-05 11:49:38 -04:00
f5d10ecf61
vectors: attempt to identify instances of virtual classes
...
Also:
- don't restrict to heap ranges (e.g. allow globals)
- stylistic cleanup
2016-04-03 20:47:21 -04:00
39bcee11d8
fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving.
2016-04-03 11:09:16 +05:30
4d95395afc
added a function to remotefortressreader.cpp to insert keyboard events
2016-03-21 22:56:48 +05:30
2f4a5e8449
Fix missing return
2016-03-20 22:04:21 +05:30
a3ddc63836
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2016-03-20 16:30:49 +05:30
14e61db99d
Add ability for remotefortressreader.cpp to send over the current screen
2016-03-20 16:27:05 +05:30
197e163a42
add follow_unit_id and follow_item_id to RemoteFortressReader
2016-03-14 13:54:46 -05:00
2f86683d37
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-13 18:31:52 +05:30
2fc784f825
Add world pole orientation to remotefortressreader.cpp.
2016-03-13 18:31:27 +05:30
5bb98295b3
Merge pull request #810 from PeridexisErrant/colonies
...
Colonies as a script, + place feature by Warmist
2016-03-13 08:32:05 -04:00
b71c1b9e7c
Merge pull request #751 from PeridexisErrant/remove-dfusion
...
Remove dfusion, df2mc, mapexport, dwarfexport
2016-03-13 08:22:07 -04:00
bc02e2a844
Add auto-gears mode for building hacks for automatic animation and gear positions.
2016-03-13 13:37:36 +02:00
5895621eec
Change eventful to have sane(r) callback for produce
2016-03-13 12:57:36 +02:00
4a5971966a
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-12 21:53:17 +05:30
6ab8c8b9b1
fix teledwarf bug (leaves babies lying on ground)
2016-03-10 13:54:38 +02:00
5ec03774b5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-05 17:30:54 +05:30
198571dca3
fix manipulator bug (unable to apply last custom profession)
...
"selected" starts with 1, not 0
2016-03-03 01:24:18 +02:00
a5494f74a0
Added world pole direction to RemoteFortressReader.proto
2016-02-28 21:26:15 +05:30
297bbd6f20
Merge remote-tracking branch 'warmist/develop' into develop ( closes #772 )
2016-02-24 17:24:03 -05:00
78a7d7a43b
Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop
2016-02-24 16:36:57 -05:00
9d0d4fd08b
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-02-24 16:34:29 -05:00
79fde493e2
Merge remote-tracking branch 'eswald/autogems-bugfix' into develop
2016-02-24 16:33:54 -05:00
d479f30592
Merge pull request #826 from eswald/stockflow-4206
...
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
8ce115646a
Updating Stockflow for version 42.06
...
The manager can now specify each type of craft individually, as well as in general.
There may be a better justification for not allowing pearl and shell scepters, though.
2016-02-23 22:09:26 -07:00
20572fb667
add new jobs to autolabor
2016-02-23 19:01:14 +02:00
420eb5341b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-20 01:31:12 +05:30
ac068b4738
Fixed DF color translation in remotefortressreader.cpp
2016-02-20 01:30:56 +05:30
224d29de88
Reversing o-W-g autogems default setting
...
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
2016-02-13 21:01:26 -07:00
e160fec2b9
Ignoring forbidden rough gems
2016-02-13 20:59:08 -07:00
d2450c34ff
forbid manipulator editing ghosts
...
they are not flags1.dead
2016-02-12 13:47:58 +02:00
Japa
lethosor
Ben Rosser
Kelly Kinkade
Lethosor
David Corbett
jj
nocico
PeridexisErrant
Carter Bray
Vitaly Pronkin
Eric Wald
Michael Casadevall
carbohydratesn
Ben Lubar
PeridexisErrant
Warmist
Japa
expwnent
sv-esk