701ac66f8e
Update DF version define. (mainly used to be able to keep backwards compatibility)
2018-12-26 00:06:49 -06:00
95d3086fe6
Remove tabs
2018-12-26 00:05:17 -06:00
0209e76f19
Merge pull request #1385 from ab9rf/labormanager-cleaning
...
labormanager: assign more dwarves to cleaning
2018-12-23 23:14:53 -05:00
92482d63f5
Merge remote-tracking branch 'ab9rf/nestboxes' into develop
2018-12-20 20:57:09 -05:00
b1f9486edd
Update map-render.cpp
...
Remove tabs
2018-12-06 15:21:19 +02:00
ef57295c02
Added coal search to embark-assistant
2018-12-04 14:58:10 +01:00
0916d69373
Added coal search to embark-assistant
2018-12-04 14:57:44 +01:00
8f9cbfeafd
Added coal search to embark-assistant
2018-12-04 14:57:23 +01:00
1ef7f0746c
Added coal search to embark-assistant
2018-12-04 14:56:55 +01:00
efeb0504cc
Added coal search to embark-assistant
2018-12-04 14:55:59 +01:00
5f6376e76e
Added coal search to embark-assistant
2018-12-04 14:55:16 +01:00
435e44d99b
Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader
2018-12-02 08:57:15 -06:00
b913076451
Update xml, stonesense, changelog
...
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
368f8d0504
Remove and replace checks for OnBreak
2018-11-24 14:52:26 -05:00
67ce858772
Changed some debug stuff to use new variable names from the xmls
2018-11-11 16:21:15 -06:00
6aea842f1b
Added tree info data to protos, not used yet.
2018-10-28 10:45:32 -05:00
85a4fef1d8
Added unknowns to saved tree export.
2018-10-28 10:22:55 -05:00
d677880131
Fix issues with missing onbreak flag
2018-10-28 10:22:03 -05:00
836c011b33
Changed the plant tiles to more descriptive names.
2018-10-28 09:33:26 -05:00
7b6b83bdcf
added a command to dump all trees in the map for debug.
2018-10-28 02:01:01 -05:00
ff452f9181
Add more comments
2018-10-12 13:37:49 +03:00
5c1b7030e7
Also rename the plugin lua file
2018-10-12 10:44:56 +03:00
d9d470e4b6
Missing REQUIRE_GLOBAL(init)
2018-10-12 10:41:43 +03:00
f74ee143dd
Might as well use REQUIRE_GLOBAL
2018-10-12 10:40:44 +03:00
cb9c964722
Rename twbt-utils to map-render
2018-10-12 10:40:20 +03:00
41856aef37
Merge remote-tracking branch 'origin_DFHACK/develop' into twbt_experiments
2018-10-12 10:31:37 +03:00
3351d78864
Change embark-assistant to biome type from Maps
...
See #1392
2018-09-11 18:27:44 -05:00
fefef2e121
Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged.
2018-08-31 20:53:06 +01:00
4e690df96a
Add Persistence module.
...
Alter World to use Persistence instead of storing data in historical figures.
Fake historical figures will be converted to the new format when a world is loaded.
Added plugin_save and plugin_load functions to the plugin API.
Made the weird int7/int28 code that was in the old persistence API slightly safer.
2018-08-26 18:27:58 -05:00
98903d9d71
[tailor] tidy
2018-08-26 09:30:08 -05:00
239d4a8c46
Attempt to full exclude disabled labors from all relevant calculations.
2018-08-26 13:38:03 +01:00
d3b335105c
Add "tailor" plugin, to provide clothing management
2018-08-25 12:02:28 -05:00
1d8e55ea9b
Merge remote-tracking branch 'DFHack/develop' into remote_reader
2018-08-24 12:15:13 +05:30
73e7ffff83
Made cancel state sensitive
2018-08-18 18:03:00 +02:00
2ed6469be8
Made cancel state sensitive
2018-08-18 18:02:19 +02:00
6275905644
nestboxes: Use buildings.others[NEST_BOX]
...
Should minimize performance impact (not that it was much before)
2018-08-16 11:33:59 -05:00
784c3b1590
a pox on invisible whitespace
2018-08-16 10:32:50 -05:00
750b3cb885
the tabmonster strikes again
2018-08-16 10:30:53 -05:00
c840321edf
move nestboxes out of devel
2018-08-16 10:23:15 -05:00
a404ab3096
nestboxes: clean up & update description
2018-08-16 10:21:44 -05:00
76b8f4af0e
Fixing tab
2018-08-10 21:25:40 +01:00
039fb3bc6b
labormanager: add option to disable the management of a labor.
...
Also switching to case insensitive labor name matching.
2018-08-10 20:42:34 +01:00
19a575df3a
labormanager: assign more dwarves to cleaning
...
I am fairly certain that Toady changed how cleaning jobs are spawned; this makes it so that cleaning actually happens with labormanager.
2018-08-09 06:18:01 -05:00
c75a4fe8ee
Used taleden's world map size algorithm
2018-08-06 11:52:22 +02:00
4b8cf7f65e
Added armor raw info.
2018-08-05 21:29:40 +05:30
aa6182a1ee
Added embark-assistant world match indication
2018-08-05 17:28:49 +02:00
136eb0f03a
Added embark-assistant world match indication
2018-08-05 17:23:03 +02:00
f7fadaab37
Added embark-assistant world match indication
2018-08-05 17:11:47 +02:00
4c850cabca
Added embark-assistant world match indication
2018-08-05 17:11:39 +02:00
70630cfd92
Added embark-assistant world match indication
2018-08-05 17:11:26 +02:00
d26b1759a2
Merge remote-tracking branches 'ab9rf/labormanager-1142', 'ab9rf/labormanager-1162' and 'ab9rf/labormanager-respect-nature' into develop
2018-08-04 00:52:59 -04:00
f2664f7926
Add unit facing and sub-tile position when moving.
2018-08-03 23:18:02 +05:30
1c137f9a35
Fix a few Lua 5.3-related errors
...
Reported on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7821831#msg7821831
2018-08-02 14:36:15 -04:00
efe4926df0
Send equipped item bodypart attachments over RFR
2018-08-02 21:50:29 +05:30
214b0c4bc6
(labormanager) respect NATURE value
...
Units with values regarding NATURE will be preferenced or dispreferenced
for jobs which might give them a good/bad feeling because of that value
2018-07-31 19:12:07 -05:00
5e95bd9cf2
Merge remote-tracking branch 'dfhack/develop' into remote_reader
2018-07-31 19:46:31 +05:30
a6067c20c1
(labormanager) only assign valid labors ( fix #1142 )
...
Add a number of tests to ensure that only assignable labors are assigned
to units, and that only units that are eligible to be assigned labors
are considered at all.
I borrowed logic from Dwarf Manipulator to identify units eligible to be
assigned labors.
This should prevent pets., ghosts, visitors, or any other noneligible
entities from being assigned labors by labormanager, and should thus fix
#1142 .
2018-07-30 22:36:59 -05:00
99490aff41
add support for craft item from pearl jobs ( fixes #1162 )
2018-07-30 21:32:15 -05:00
0a0cbdf2de
Add creature flags to RFR creature raws.
2018-07-28 18:39:45 +05:30
d9fb364b3f
Fix prospector out-of-bounds crash and improve checking
...
Fixes #1370
2018-07-21 00:27:11 -04:00
61df5e5286
Merge remote-tracking branch 'KlonZK/patch-1' into develop
2018-07-20 23:16:28 -04:00
09ec8910ca
Avoid clearing CMAKE_CXX_FLAGS for plugins
2018-07-19 15:32:08 -04:00
af53fe6740
embark-assistant: fix x=16, y=16 dimensions
2018-07-19 14:48:28 -04:00
3e82bd8f35
Ignore CMakeLists.custom.txt and create it if it does not exist during cmake.
2018-07-18 14:00:40 -05:00
29f6131e26
fix custom animation tables
...
move "local frames" from inside the block to outside.
2018-07-16 10:39:05 +02:00
baef5ca319
Added Finder scrolling and Frozen search
2018-07-13 20:44:11 +02:00
1af0ec4006
Added Finder scrolling and Frozen search
2018-07-13 20:43:49 +02:00
3d5cadeb8c
Merge branch 'embark-assistant' of https://github.com/PatrikLundell/dfhack into embark-assistant
2018-07-13 17:53:34 +02:00
4137a17a78
Added Finder scrolling and Frozen search
2018-07-13 17:43:46 +02:00
658fac0b93
Added Finder scrolling and Frozen search
2018-07-13 17:43:22 +02:00
3e47de5b45
Merge branch 'develop' into embark-assistant
2018-07-13 11:33:57 -04:00
fdf52deb36
Added Finder scrolling and Frozen search
2018-07-13 17:23:34 +02:00
02dd97722c
Added Finder scrolling and Frozen search
2018-07-13 17:23:12 +02:00
4d3f9ce13d
Added Finder scrolling and Frozen search
2018-07-13 17:22:49 +02:00
539428b741
Added Finder scrolling and Frozen search
2018-07-13 17:22:26 +02:00
f41715309a
Added Finder scrolling and Frozen search
2018-07-13 17:21:42 +02:00
c82532fd4b
Merge remote-tracking branch 'suokko/ruby_memory_return_calling_convention' into develop
2018-07-12 14:53:20 -04:00
7afa3690bf
Add support for DFHACK_BUILD_ID
...
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
06511340ab
Merge remote-tracking branch 'BenLubar/proto-docs' into develop
2018-07-10 11:26:31 -04:00
21b9e828d3
embark-assistant: add spaces around keys
...
Further spacing work is tedious without rewriting it to use DFHack::Screen or
uicommon.h as every coordinate needs to be adjusted by hand
2018-07-10 11:22:12 -04:00
eb1f3e1d4c
embark-assistant: add spaces around drawBorder titles
2018-07-10 11:01:22 -04:00
8dec8c332f
embark-assistant: use STANDARDSCROLL keys instead of CURSOR keys for scrolling
2018-07-10 10:59:52 -04:00
2dac3c53c7
Add stress cutoffs to Units module, fix dwarfmonitor/manipulator
...
Fixes #1292
2018-07-09 15:59:12 -04:00
46e53fc3b3
Make df2console only call df2utf if the output stream is a console
...
Fixes output in command-prompt, for example
2018-07-09 11:00:28 -04:00
4b64d2dec6
Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader
...
# Conflicts:
# docs/changelog.txt
2018-07-08 19:23:56 +05:30
10abbf8ac2
Update docs for dfhack/stonesense#57
2018-07-08 00:19:58 -04:00
00fa70dae9
Bump to beta2.1 (stonesense fix)
2018-07-07 21:42:01 -04:00
d2d1501dfd
Merge remote-tracking branch 'suokko/workflow_crafts_advanced' into develop
2018-07-07 19:43:16 -04:00
037e7e4901
Merge remote-tracking branch 'suokko/spotclean_ui_state_fix_1194' into develop
...
Moved/adjusted changelog entry
2018-07-07 18:08:53 -04:00
3bec52b2a7
embark-assistant: some cleanup
2018-07-06 15:16:45 -04:00
ff6d0c4e7d
Fix memory return calling convention in ruby bindings
...
Calling convention for memory return is that caller allocates (in stack)
memory to hold returned object. Then caller passes the pointer to callee
as implicit first parameter.
references:
https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
https://msdn.microsoft.com/en-us/library/7572ztz4.aspx
Fixes #1209
2018-07-04 23:46:23 +03:00
57dd9e944e
Fix crafts advanced constraints in workflow
...
Fixes #1247
2018-07-04 19:10:51 +03:00
d1a3f1a738
Allow canceling lineedit with ctrl+c
2018-07-04 15:21:25 +03:00
490a855776
Add a test for signal_shared_tag implementation
...
The test cases check that the signal_shared_tag implementation can be
used and destructed safely from multiple threads.
2018-07-04 15:18:20 +03:00
9cfb07f476
Add debug plugin to manage runtime debug filters
2018-07-04 15:18:20 +03:00
5db34339a5
Fix typo
2018-07-03 18:17:04 -05:00
4a0682133e
Annotate plugin proto files with the name of the plugin they are associated with.
2018-07-03 15:54:30 -05:00
df9150f302
Add documentation for RPC functions supported by RemoteFortressReader and ISOWorldRemote.
2018-07-03 15:37:16 -05:00
6839fde555
Remove execute permission on files that are not executables.
2018-07-03 15:37:16 -05:00
616675f0ce
Merge remote-tracking branch 'suokko/kittens_data_race_fix' into develop
2018-07-03 00:30:36 -04:00
81a7ddcf92
Merge remote-tracking branch 'suokko/screen_show_memory_leak' into develop
2018-07-02 22:58:11 -04:00
7e91173289
Merge remote-tracking branch 'origin/develop-cf-autofix' into develop
2018-07-02 13:44:20 -04:00
7fd23d46f0
Send the building preview over RFR
2018-07-02 22:04:47 +05:30
f0ff96f614
Merge remote-tracking branch 'suokko/multibyte_console' into develop
2018-07-02 10:55:03 -04:00
c489147657
Enabled building buildings through RFR
2018-07-02 00:37:02 +05:30
a08f08ae5f
[CodeFactor] Apply fixes
2018-07-01 15:25:53 +00:00
d9b910f79c
Made a function to find building extents for un-built buildings.
2018-07-01 20:36:36 +05:30
9c2e052d4d
More detail in build menu
2018-07-01 14:00:05 +05:30
645ec0d591
Improve kittens thread safety and shutdown with core
...
The bools could use acquire&release memory order or even relaxed but I
didn't think code was worth auditing for such low level optimizations.
Sequantial consistent is fast enough but much harder to use incorrectly.
The timeLast is protected by CoreSuspender lock. plugin_update is only
called when CoreSuspender lock is held.
The last_menu is protected by trackmenu_flg loads and stores.
2018-06-30 21:53:12 +03:00
0727403ac1
Fix devel plugins linking in linux
2018-06-30 21:12:42 +03:00
105ddd86d8
Merge remote-tracking branch 'suokko/jsoncpp_upgrade_to_submodule' into develop
2018-06-29 22:33:00 -04:00
44f461711c
Respond to building selection commands.
2018-06-29 21:59:48 +05:30
897b7b6a47
Send the building menu items over RFR
2018-06-28 20:27:12 +05:30
afd942a94b
ruby: Support automatic array size from index-enum
2018-06-26 23:48:54 +03:00
4970935b9a
fixed sidebar mode numbering.
2018-06-24 16:19:52 +05:30
93c3418f97
Added a simple function to get the current sidebar mode in fort mode.
2018-06-24 14:45:57 +05:30
1fc37f8ddc
Checke Console::lineedit error return values
...
Console::lineedit can return -1 to indicate input error and -2 to
indicate the program is closing. But most users don't check possible
unusual return values which can lead to exit hang.
2018-06-22 17:57:37 +03:00
9c7bd562d4
fix-unit-occupancy, autogems: stop running while embarking
...
Related to #1286 fix
2018-06-21 16:16:54 -04:00
46e31305a1
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-06-21 15:54:03 -04:00
f20dae5a4c
Merge remote-tracking branch 'suokko/fix_dramp_to_check_jobs_1228' into develop
2018-06-21 15:20:41 -04:00
8e1a1851be
Removed temporary comments
2018-06-21 21:00:59 +02:00
9a8e251853
Updated evil weather
2018-06-21 20:51:36 +02:00
f02f4b8bcc
Updated evil weather
2018-06-21 20:51:05 +02:00
91aa16216b
Updated evil weather
2018-06-21 20:50:30 +02:00
1382c04696
Updated evil weather
2018-06-21 20:49:49 +02:00
14b0ea5b98
Updated evil weather
2018-06-21 20:49:08 +02:00
ad5328e119
Updated evil weather
2018-06-21 20:48:35 +02:00
42eadf97b0
Update stonesense ( #1302 , dfhack/df-structures#247 )
2018-06-21 12:00:12 -04:00
d9917e9a1d
cxxrandom: remove pragmas, fix format warnings, misc. cleanup
2018-06-21 12:00:04 -04:00
7a5e7c7c86
Rename unit_flags1.dead to killed, update submodules/changelog
...
Follow-up for dfhack/df-structures#247
2018-06-21 11:17:09 -04:00
46b6bfd3f7
Merge remote-tracking branch 'suokko/fix_stocks_to_filter_military_items_1288' into develop
2018-06-21 00:04:06 -04:00
b2fd0b062b
Merge remote-tracking branch 'PatrikLundell/dead_plugins' into develop
2018-06-20 16:18:07 -04:00
72029e7de9
Avoid closing DF if launching command-prompt from prompt
2018-06-20 22:16:23 +03:00
9b6781f0f2
Temporary lower command-prompt when executing the command
...
command-prompt viewscreen may affect command execution if they are
looking for UI state. To make commands execute simillary to hotkeys or
console commands the viewscreen needs to removed from the top position.
Fixes #1194
2018-06-20 21:51:45 +03:00
cdca28ddfa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-06-20 12:10:52 -04:00
7036cc376b
Fix warnings in devel plugins introduced by #1302
2018-06-20 12:03:14 -04:00
6077a8ce4c
Merge remote-tracking branch 'suokko/printf_warnings' into develop
2018-06-20 11:25:14 -04:00
862fa08ba6
Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop
2018-06-20 11:00:43 -04:00
f90eebdd2d
Add designation job check to deramp
...
Fixes #1228
2018-06-20 15:54:31 +03:00
bd0d36ec82
Fix stockpile inventory not to include inventory items
...
Inventory items have stale position information. The coordinates can be
very old if item is owned and continuesly carried for long time. The fix
checks if item is carried. To avoid filtering carried items that are
assigned (containers) to the stockpile the assignment needs to be
checked.
Fixes #1288
2018-06-19 18:06:28 +03:00
9c59b7ff48
Fix unlikely memory leaks if Screen::show fails
...
The Screen::show takes ownership of the screen pointer. I decided to
switch the parameter to std::unique_ptr to make the pointer ownership
explicit. The unique_ptr then provides automatic screen destruction in
Screen::show unless pointer is inserted or is already in the linked list
that is managed by df.
2018-06-19 16:41:31 +03:00
dc367f212e
Move fortress mode control stuff into a different file.
2018-06-18 22:12:52 +05:30
6ef85908ac
Bump df version
2018-06-18 21:28:56 +05:30
6f7ace1f6d
stockpiles: Fix unusable and usable loading for weapon and armor
...
Fixes #1294
2018-06-14 22:22:51 +03:00
2b79b4cce7
Use jsoncpp 1.8.4 as a submodule
...
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.
jsoncpp library name changes to jsoncpp_lib_static.
jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
aac892c560
Adapted to changed Units functions
...
Squashed version of #1307
Closes #1307
2018-06-14 10:30:35 -04:00
cf780ce035
dead flag -> !isActive
2018-06-14 12:35:17 +02:00
cac749429a
dead flag -> !isActive
2018-06-14 12:34:41 +02:00
3be27a49b5
dead flag -> !isInactive
2018-06-14 12:33:18 +02:00
f076d00ede
dead flag -> !isActive
2018-06-14 12:32:38 +02:00
b38dfe2e43
dead flag -> !isActive
2018-06-14 12:31:52 +02:00
da0aa85b05
dead flag -> !isActive
2018-06-14 12:31:15 +02:00
aa361f3a0d
dead flag -> !isActive
2018-06-14 12:30:41 +02:00
6901c53bd5
dead flag -> !isActive
2018-06-14 12:29:48 +02:00
897a818f4c
Switch to Units functions
2018-06-14 09:42:45 +02:00
39194e5e38
Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11)
2018-06-13 16:08:41 -04:00
cddb1b59e1
title-version: move to bottom of options screen
...
This avoids overlapping the window border when a world is loaded
2018-06-13 15:57:13 -04:00
de0521e618
title-version: add to options screen
2018-06-12 16:38:53 -04:00
40d0d946a4
autogems: avoid crash with non-workshop links, add some logging
...
Also update changelog, including revflood change
Fixes #1303
2018-06-12 12:17:04 -04:00
8f2cf3ad26
Fix printf format warnings
2018-06-11 19:57:06 +03:00
01abcb756e
Request c++14 support from compilers
...
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
2018-06-10 23:15:33 +03:00
8717144f14
Fix revflood bug, was revealing some tiles from below inappropriately
...
When scanning floor tiles from below, don't just leave them hidden, but
skip checking neighbors as well
2018-06-09 14:19:52 -06:00
7e57450e78
Change buildingplan quality adjustment keys per #1284 comment, for consistency
2018-06-08 22:25:56 -04:00
c4692b1c8d
Merge remote-tracking branch 'TotallyGatsby/buildingplanmax' into develop
2018-06-08 22:07:54 -04:00
0ec3df6022
dead/killed flags
2018-06-08 11:09:11 +02:00
654f798b83
dead/killed flags
2018-06-08 11:08:35 +02:00
03968db344
Fix GCC warnings in 'tweak kitchen-prefs-all' and dev plugins
2018-06-01 10:02:38 -04:00
f57327e7c8
Fix periodic events in several plugins
...
Also stop running buildingplan/fortplan while loading a world, and stop running
autogems while paused
Fixes #1286
2018-05-29 23:24:02 -04:00
06b9dc0c1c
remove trailing spaces
2018-05-25 12:43:30 +12:00
a44f5b57cb
don't need this
2018-05-25 01:34:57 +12:00
0217916568
mousequery plugin with TWBT modifications
2018-05-25 01:07:12 +12:00
e206a6d88b
mousequery: leave menus safely, without looping
...
Fixes #1285
2018-05-22 16:37:44 -04:00
5f81cac3b7
dwarfmonitor.lua: use dmerror() consistently
2018-05-21 21:23:52 -04:00
3e54a136fd
Use two keys for min/max
2018-05-20 20:50:42 -07:00
385ac3f9f5
Add 'Max Quality' setting to buildingplan
2018-05-20 14:36:50 -07:00
50a863a48e
Fix Kitchen.h include (case-sensitive)
2018-05-17 20:11:46 -04:00
b551e70ffa
prospector: Avoid crashing due to invalid vein materials
...
Fixes #1276 , ref #1277
2018-05-17 19:56:48 -04:00
759ba5c420
New tweak: kitchen-prefs-all
...
Options to toggle brew/cook for all listed items
Also fixed kitchen lua docs and moved kitchen search option
2018-05-17 19:47:56 -04:00
17ba492992
Add some exclusion functions to Kitchen module, expose to Lua, fix build
2018-05-17 19:34:03 -04:00
fa8a2fa670
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-17 00:12:59 -04:00
79a0794658
Add kitchen preferences search
2018-05-17 00:11:52 -04:00
b6c6b4a8a0
Merge pull request #1252 from JapaMala/remote_reader
...
Bump RFR version number.
2018-05-17 07:48:18 +05:30
c85274eb01
tweak max-wheelbarrow: fix conflict with building renaming
...
Reported by xordae on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7762438#msg7762438
2018-05-16 16:51:45 -04:00
0be16d4422
New tweak: stone-status-all
...
Adds an option to toggle the economic status of all stones
Also suggested by xq on IRC
2018-05-14 22:54:20 -04:00
914b376082
Add stone status search
...
Suggested by xq on IRC
2018-05-14 22:30:21 -04:00
ee85ed4011
Remove $(NOINHERIT) from Stonesense
2018-05-14 00:56:18 -05:00
f838b5695d
Remove $(NOINHERIT) which was inexplicably included in a bunch of plugins.
2018-05-14 00:12:22 -05:00
06031bdd0e
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-13 13:11:29 -04:00
e2cd1fca58
Reorder dfhack-md5 GCC flags, fix another embark-assistant warning
2018-05-13 13:09:51 -04:00
586051510c
Update stonesense.
2018-05-13 10:38:59 -05:00
016dab3990
Fix more warnings, including stonesense
2018-05-12 22:10:07 -04:00
e9ec08f419
Add Buildings::getRoomDescription(), moved from search plugin, +cleanup
2018-05-12 17:00:21 -04:00
7d0df117ee
dwarfmonitor: fix typo in function name
2018-05-12 14:59:26 -04:00
ad518faeec
cursecheck: Replace setUnitNickname (older) with Units::setNickname
2018-05-12 14:59:04 -04:00
c15571caa0
Move isRouteVehicle, isSquadEquipment from workflow to Items module
2018-05-12 14:49:30 -04:00
abb903d28f
command-prompt: support getSelectedPlant()
2018-05-12 13:02:52 -04:00
a34b34d3cb
Move a few item functions from autotrade/stocks into DFHack::Items
2018-05-12 12:04:46 -04:00
fbe652d7a0
Merge pull request #1265 from db48x/allow-calling-blueprint-from-lua
...
this allows the blueprint plugin to be called from lua
2018-05-11 23:52:16 -04:00
018deec912
Fix another occasional segfault in block-labors
...
Fixes #1057
2018-05-11 22:18:26 -04:00
9d353c1ea7
tweak block-labors: fix crash if unit is null
...
Fixes #1057
2018-05-11 10:21:05 -04:00
58636f5a27
Make 32-bit Linux builds also check for undefined symbols.
2018-05-10 11:20:19 -05:00
8e76c612f6
Add SDL to RFR libs on Linux
2018-05-09 21:48:27 -04:00
77ee74be50
Only require symbols to be defined in plugins
...
Core uses some unresolved symbols on Linux
2018-05-09 21:36:51 -04:00
a550c81628
update the CMakeList to link the blueprint plugin against the lua library
2018-05-09 18:25:26 -07:00
b127522992
Merge branch 'develop' into allow-calling-blueprint-from-lua
2018-05-09 12:55:17 -07:00
2ada907420
Move stockpiles option (load/save) below stocks/autodump/etc
...
Fixes #1161
2018-05-09 10:33:41 -04:00
ead0092765
Ignore added stockpile keys when renaming stockpiles
...
Fixes #1267
2018-05-09 10:25:55 -04:00
2a52582c1f
Add Gui::inRenameBuilding
2018-05-09 10:23:05 -04:00
d15f87715e
update comments
2018-05-08 13:04:14 -07:00
554814920b
this allows the blueprint plugin to be called from lua
2018-05-08 11:42:41 -07:00
9d7feaf39d
autogems: load blacklist from autogems.json
...
Closes #1027
2018-05-05 12:49:06 -04:00
60d1c270c2
Display autogems config option
2018-05-04 23:07:21 -04:00
bc32d15bea
[Release] cxxrandom v2.0
...
Major Revision
update v2.0
=-=-=-=-=
Native functions(exported to lua):
-GenerateEngine: returns engine id (args: seed)
-DestroyEngine: destroys corresponding engine (args: rngID)
-NewSeed re-seeds engine (args: rngID, seed)
-rollInt generates random integer (args: rngID, min, max)
-rollDouble generates random double (args: rngID, min, max)
-rollNormal generates random normal[gaus.] (args: rngID, avg, stddev)
-rollBool generates random boolean (args: rngID, chance)
-MakeNumSequence returns sequence id (args: start, end)
-AddToSequence adds a number to the sequence (args: seqID, num)
-ShuffleSequence shuffles the number sequence (args: rngID, seqID)
-NextInSequence returns the next number in seq.(args: seqID)
Lua plugin functions:
-MakeNewEngine returns engine id (args: seed)
Lua plugin classes:
-crng
methods:
-init(id, df, dist) :: constructor
id - Reference ID of engine to use in RNGenerations
df (optional) - bool indicating whether to destroy the Engine when the crng object is garbage collected
dist (optional) - lua number distribution to use
-__gc() :: destructor
-changeSeed(seed) :: alters engine's seed value
-setNumDistrib(distrib) :: set's the number distribution crng object should use
distrib - number distribution object to use in RNGenerations
-next() :: returns the next number in the distribution
-shuffle() :: effectively shuffles the number distribution
-normal_distribution
methods:
-init(avg, stddev) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-real_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-int_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-bool_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next boolean in the distribution
id - engine ID to pass to native function
-num_sequence
methods:
-init(a, b) :: constructor
-add(num) :: adds num to the end of the number sequence
-shuffle() :: shuffles the sequence of numbers
-next() :: returns next number in the sequence
Adds missing function exports.
Fixes numerous problems I won't go into
2018-04-29 21:08:44 -07:00
23b2d5eba5
Merge branch cxxrandom
...
Implements helper functions for random number generation.
Implemented using C++11 <random> library.
Exported Lua Functions:
- seedRNG(seed)
- rollInt(min, max)
- rollDouble(min, max)
- rollNormal(mean, std_deviation)
- rollBool(chance_for_true)
- resetIndexRolls(string, array_length) --String identifies the instance of SimpleNumDistribution to reset
- rollIndex(string, array_length) --String identifies the instance of SimpleNumDistribution to use
--(Shuffles a vector of indices, Next() increments through then reshuffles when end() is reached)
On branch cxxrandom-rel
Changes to be committed:
modified: plugins/CMakeLists.txt
new file: plugins/cxxrandom.cpp
new file: plugins/lua/cxxrandom.lua
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Squashed commit of the following:
commit 3a7ef70d45f3e0c2fe367141dd0349dddaaff60d
Merge: fd9f1982
2018-04-29 21:08:44 -07:00
5cd8aa0458
Update downloads to 0.44.09
2018-04-19 12:35:00 -04:00
0ea35a6e93
Merge remote-tracking branch 'lethsor/master' into remote_reader
2018-04-11 18:28:41 +05:30
f9ad71f682
Fix fencepost error in autolabor/autohauler/labormanager.
...
https://github.com/DFHack/dfhack/pull/1253#pullrequestreview-110903215
2018-04-10 13:29:00 -05:00
afc2c476bb
Fix remaining warnings on Windows.
2018-04-06 21:22:48 -05:00
67de61a1fe
Fix GCC warnings in stonesense.
2018-04-06 18:18:48 -05:00
1dd6625270
Fix remaining warnings in supported plugins
2018-04-06 14:17:34 -05:00
a7dfacd1c5
Fix warnings in supported plugins.
2018-04-06 01:25:21 -05:00
f3038fef09
Mark static functions in uicommon as "static inline" to remove the warning if they are not used.
2018-04-05 16:51:10 -05:00
7aee061258
Ignore warnings in plugin protobufs.
2018-04-05 16:50:28 -05:00
a37df92656
[labormanager] fix warning about non-virtual destructor in jlfunc
2018-04-05 16:04:14 -05:00
91930a618f
[dwarfvet] Fix infinite loop if an animal is not accepted at a hospital.
2018-04-05 15:01:50 -05:00
1badadf535
search: fix 4/6 keys in unit screen
2018-04-05 10:08:07 -04:00
868c032578
liquids: initialize range dimensions
2018-04-05 02:19:04 -04:00
e9457b9f65
liquids: use unique_ptr properly
2018-04-05 02:15:32 -04:00
996306560b
Merge remote-tracking branches 'ab9rf/digtype-1243' and 'ab9rf/labormanager-map-check-bug' into develop
2018-04-02 00:56:33 -04:00
d369f8be67
Bump version number.
2018-03-26 19:07:04 +05:30
b8de7d4cf8
check for tile material == MINERAL in digtype ( #1243 )
2018-03-20 01:44:10 -05:00
81c9c8cdfe
Avoid crashing labormanager if map square on lowest level is designated+hidden ( #1240 )
2018-03-20 00:55:17 -05:00
3a2fc6f65f
Update stonesense
2018-03-14 09:40:21 -04:00
9b6b73b1d2
Merge pull request #1232 from JapaMala/remote_reader
...
Remote reader
2018-03-14 09:31:56 -04:00
02569b1dac
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-03-14 09:29:35 -04:00
40d3b9b782
embark-assistant: fix copy-paste error, update docs ( #1231 )
2018-03-14 09:28:24 -04:00
1e7a38f0b1
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-03-14 09:24:47 -04:00
4d74f66b64
Merge remote-tracking branch 'DFHack/develop' into remote_reader
2018-03-14 16:18:03 +05:30
09bc1c3169
add ocean waves to RFR
2018-03-14 16:08:37 +05:30
40654954a1
Partial preparation for 0.44.07-alpha1.
...
Still need to write release notes and add tags.
2018-03-13 15:49:42 -05:00
ad57037711
Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop
2018-03-10 17:02:34 -05:00
db95796d4c
Many build fixes
2018-03-10 16:53:45 -05:00
a810960bde
Support spiderwebs and add a fake flow type for campfires.
2018-03-10 21:02:28 +05:30
acd4adc7cc
Fix CMake warning about CMP0022 policy being set as "OLD".
2018-03-08 02:28:28 -06:00
3e7da4d5f2
FIx wrong material being sent with item flows.
2018-03-06 22:37:26 +05:30
c3f931652d
Send item cloud info properly.
2018-03-06 09:44:21 +05:30
c765e12254
Store tool names in RFR
2018-03-05 19:00:18 +05:30
ebf9651896
Include Materials in flows.
2018-03-04 02:41:40 +05:30
894f6c232b
actually copy flows with the block this time.
2018-03-03 12:48:09 +05:30
3f26d4fe09
Add flows to RFR
2018-03-03 11:41:58 +05:30
ef24da0cd3
Key references on overlay as well
2018-02-27 21:06:07 +01:00
490fbd8b26
send instrument description using UTF8
2018-02-27 21:18:15 +05:30
65e549848d
fix some crashes in the new instrument reader code.
2018-02-27 21:01:38 +05:30
d758104f5e
update stonesense for RFR protos
2018-02-27 20:24:32 +05:30
265e229d61
Send all relavent generated instruement information over RFR
2018-02-27 19:58:07 +05:30
578d6666eb
Addressed request. Improved profile saving
2018-02-27 10:46:06 +01:00
7705eada5a
Added magma/candy search + profile save/load.
2018-02-26 18:31:33 +01:00
2277c4ee4e
Corrected reanimation detection
2018-02-25 10:28:38 +01:00
800dde360d
Merge pull request #1223 from JapaMala/remote_control
...
Remote control
2018-02-21 23:04:53 -05:00
9f9d90c2ef
Fix labormanager never assigning dwarves to fill ponds, making irrigation very difficult.
2018-02-21 18:46:21 -06:00
778a1667dc
...also do it for images.
2018-02-21 22:31:39 +05:30
8c20d178b5
Include plant type with plant items.
2018-02-21 22:27:04 +05:30
1c97f58340
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-21 21:29:58 +05:30
6e3b29930d
Avoid crash in dwarfvet due to negative width/height
...
Partial fix for #1227
2018-02-16 15:12:46 -05:00
7758fb6df5
dwarfvet: fix another log message, misc readability improvements
2018-02-16 02:32:53 -05:00
36f4954182
Update Stonesense and build docs (fixed Allegro download)
2018-02-16 02:16:06 -05:00
94b2ca68d8
dwarfvet: fix extra % in log message
...
Mentioned in #1227
2018-02-13 11:19:10 -05:00
60e9839f63
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-13 21:29:09 +05:30
18cf70a543
Update Stonesense.
2018-02-13 12:37:45 +05:30
7b19c9b8f0
Merge remote-tracking branch 'remotes/DFHack/develop' into RemoteServerUnsafe
...
# Conflicts:
# plugins/proto/RemoteFortressReader.proto
# plugins/remotefortressreader/remotefortressreader.cpp
# scripts
2018-02-12 20:19:40 +05:30
3a122d7391
Merge remote-tracking branch 'danamlund/better-fps-counter' into develop
2018-02-12 01:21:14 -05:00
6260062d05
Add basic embark-assistant docs ( closes #1226 )
2018-02-11 03:08:02 -05:00
ca29cb8e6f
embark-assistant: update field names, now compiles
2018-02-10 17:51:02 -05:00
ef3adbe816
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-02-10 17:27:13 -05:00
9a0befa4cb
Show number of trees skipped
2018-02-10 03:03:07 -05:00
342f193409
autochop: store skip settings in one field, fix double colon and initial load
...
language_name fields default to -1, so the new settings could have been enabled
on all worlds by default.
2018-02-10 02:07:36 -05:00
6a758c70a8
Merge remote-tracking branch 'dtimm/develop' into develop
2018-02-10 01:47:06 -05:00
55f5439ddf
dwarfmonitor: remove unused hook, use CoreSuspendClaimer
2018-02-09 02:07:08 -05:00
6d33069fe9
Fix more copy-paste errors
2018-02-05 10:41:36 -05:00
7f8ea9e82c
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-05 20:11:55 +05:30
9a032ac447
I'm a moron.
2018-02-05 20:11:47 +05:30
b2a19dedeb
load-art-image-chunk: safety check
2018-02-04 22:56:24 -05:00
78061085c6
Add art image properties to RFR
2018-02-04 16:02:02 +05:30
60c1bd3c66
Merge remote-tracking branch 'refs/remotes/DFHack/develop'
...
Conflicts:
library/xml
2018-02-04 10:26:39 +05:30
ed406e0e3d
fix naming and return statement.
2018-02-04 10:24:51 +05:30
c621a29fe3
Fix global name.
2018-02-04 10:21:28 +05:30
38140fb450
Copy engravings in RFR, and update the art image function.
2018-02-04 10:12:15 +05:30
bdba95f90c
memview: check for tags from sizecheck
2018-02-03 18:10:16 -05:00
6181b2bce3
Add tweak that replaces dwarf mode FPS counter with one that does not count when paused
2018-02-03 17:58:24 +01:00
8665600574
Send tiles for shape descriptors, and art image ids.
2018-02-03 10:38:17 +05:30
e63a871363
use the vmethod for getting improvement images.
2018-01-31 10:11:43 +05:30
9aaeecb4d6
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-01-28 13:41:52 +05:30
788a48144b
dig: fix issues with priority parameters and digvx/diglx
2018-01-28 02:16:57 -05:00
b78b2feed2
Remove extra whitespace.
2018-01-28 10:12:50 +05:30
ca3b2b30b3
fix compiling on gcc.
2018-01-27 19:26:30 +05:30
341c0dacf3
updated function definition for win64.
2018-01-27 12:44:51 +05:30
aff9c22875
update submodules.
2018-01-26 08:27:03 +05:30
e3d95daf45
Don't use globals
2018-01-26 08:19:41 +05:30
5e0e674580
Update submodules
2018-01-25 10:56:08 -05:00
ef451a2f2d
Got the image reader function working.
2018-01-25 20:24:12 +05:30
f1b8fa305b
try using the new function pointer.
2018-01-25 11:55:46 +05:30
68324dfe0b
Send statue images.
2018-01-25 07:53:19 +05:30
ee7ad348f0
add item images
2018-01-24 12:09:05 +05:30
42bbe124b7
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2018-01-24 10:24:23 +05:30
f75b116ae2
Added the rest of the relavent improvement headers.
2018-01-24 10:22:45 +05:30
f33c42a49e
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-24 10:04:51 +05:30
1ba5477b63
Add designation priority support to MapCache and dig plugin
...
Fixes #481
2018-01-21 19:27:16 -05:00
7439f7fba7
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-19 22:11:48 +05:30
58bef276de
send item imrpovements
2018-01-19 08:25:16 +05:30
1ed6c70663
dwarfmonitor: Add "view unit" option to prefs screen
2018-01-18 10:17:54 -05:00
74aefddd75
dwarfmonitor: Use a reasonable default for unhandled item types
2018-01-18 10:17:40 -05:00
b035d9e53a
ListColumn: only change items' foreground color in selected columns
2018-01-18 10:05:31 -05:00
7b16cf1619
dwarfmonitor: actually display creature names
2018-01-18 09:54:33 -05:00
9515a9e4f5
dwarfmonitor: use interface_key overload of OutputHotkeyString, grey out unit option
2018-01-18 01:14:30 -05:00
5f588b376a
dwarfmonitor: make handling of unrecognized preferences more obvious
2018-01-18 01:07:20 -05:00
4e2c6194ca
dwarfmonitor: support poetic/musical/dance forms
2018-01-18 01:06:55 -05:00
909776571e
dwarfmonitor: support getSelectedUnit
2018-01-18 01:06:03 -05:00
f2890620d1
Remove tweak kitchen-keys - DF bug 614 was fixed
2018-01-18 01:05:33 -05:00
a63347cf7a
Move item reader to a separate file.
2018-01-17 19:10:19 +05:30
ea6757377e
add item volume to RFR
2018-01-16 17:04:26 +05:30
9ba0b00580
Remove the stupid big warning comment.
2018-01-12 11:59:02 +05:30
8d6e30ef0e
Fix whitespace issues
2018-01-12 11:50:40 +05:30
56c76d5abc
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-12 11:17:22 +05:30
2782008b42
Update tweak condition-material with new field names
...
dfhack/df-structures#236
2018-01-10 19:53:25 -05:00
724fb00b73
Use an inteligenter method of setting the gem shapes.
2018-01-08 09:58:37 +05:30
29426111f7
Send shapes for small gems too.
2018-01-07 01:14:15 +05:30
d80d16ddc3
Actually send gem shape.
2018-01-07 00:50:32 +05:30
d0a924a207
Send shape ids through RFR
2018-01-06 23:48:06 +05:30
bd8a6c31ba
Send vehicles over remoteFortressReader, and don't send every block like a retard.
2018-01-06 22:07:34 +05:30
d6df9cd257
tidying up
2017-12-31 13:57:37 +02:00
04465f59f5
Fix spaces and fix linux (again)
2017-12-31 13:57:37 +02:00
6a65ad2fcb
add more functions (not used yet) and fix linux
2017-12-31 13:57:37 +02:00
e48e2e6534
A twbt utils plugin for misc stuff used in twbt by mifki.
...
Currently only render map function.
2017-12-31 13:57:37 +02:00
546841d194
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2017-12-31 14:33:03 +05:30
fa39220777
add projectiles, complete with velocity.
2017-12-31 14:31:58 +05:30
e72474613f
Add new PutItemOnDisplay job to labor management plugins
...
Also add building_type::DisplayFurniture to labormanager
Fixes #1208
2017-12-27 13:48:53 -05:00
cdfe1cf1c7
add a few more hotkeys to adventure control
2017-12-26 22:21:36 +05:30
e9e5113ff7
Add careful movement type to proto. Not used yet.
2017-12-26 12:34:46 +05:30
f5fc7fe1a1
Report the current adventure mode menu back to Armok Vision, currently including careful movement options.
2017-12-26 00:08:05 +05:30
e8ccfb4e4d
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2017-12-25 22:00:54 +05:30
5d32253b6e
added jumping ability to adventure control.
2017-12-25 22:00:45 +05:30
9b562aac73
Merge remote-tracking branch 'DFHack/develop' into remote_control
2017-12-25 10:45:37 +05:30
d6a6bf008e
Update xml, stonesense
...
Ref #1206
2017-12-24 23:17:39 -05:00
1408f7bfb3
Add a command to remotely send simple movement commands to an adventurer.
2017-12-24 18:33:25 +05:30
79467df263
Merge branch 'remote_reader' of https://github.com/JapaMala/dfhack.git
2017-12-20 17:21:46 +05:30
04b1a80654
Don't re-send all reports all the time.
2017-12-20 17:11:01 +05:30
e478c00ce5
Replace tab with space.
2017-12-19 11:20:12 +05:30
c4f9f6edb2
Add item stack size.
2017-12-17 18:42:03 +05:30
29282a238b
Bring in changes from the remoteServerUnsafe branch.
2017-12-17 18:05:38 +05:30
bbd823f5b0
Simplify logic in createitem, to avoid similar errors in the future
2017-12-16 15:40:39 -06:00
b1e77fa260
createitem: fix an issue with items teleporting to the location of another unit
...
This was due to moveToGround() being called twice, first with the location of
world.units.active[0], which caused the item to teleport to that location later.
Fixes #1198
2017-12-16 16:09:43 -05:00
23bb8c4f3d
Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor
2017-12-07 14:37:15 -05:00
88c7e493b8
Merge ui_area_map_width into ui_menu_width, now a 2-byte array
2017-12-03 20:34:59 -06:00
a0634f9ee0
Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe
2017-11-25 11:50:56 +05:30
7fd2586f62
Remove trailing whitespace
2017-11-25 11:39:15 +05:30
4a52f322c3
Remove tabs.
2017-11-25 11:37:54 +05:30
2c95ac411e
Update xml and all uses of job_handler
2017-11-25 00:59:59 -05:00
272f51ef4b
Merge remote-tracking branch 'remotes/DFHack/master' into RemoteServerUnsafe
2017-11-25 10:24:51 +05:30
c8cd2f40bc
Merge pull request #1188 from BenLubar/labormanager-culture-crash
...
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 16:22:44 -05:00
1d679e713e
Merge pull request #1156 from ViTuRaS/patch-1
...
max_barrels was serialized on max_bins position
2017-11-23 11:58:08 -05:00
9259cb22d2
Merge pull request #1184 from quietust/develop
...
update structures
2017-11-23 11:57:41 -05:00
e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 10:55:37 -06:00
e3a41a323d
Update Units
2017-11-05 16:06:51 +05:30
53b5a5cc6f
Added a function to only get details for units within the area of interest.
2017-11-04 20:14:24 +05:30
33a43c5bfd
update structures
2017-11-04 07:50:47 -06:00
b449446526
Send announcements in Unicode.
2017-10-30 19:23:17 +05:30
117b6e0427
Send reports over RFR.
2017-10-30 19:00:03 +05:30
e51ae78a46
Always follow the current adventure in adventure mode.
2017-10-22 13:37:23 +05:30
b480cd6b38
Mark RFR functions as being safe for network use.
2017-10-20 19:07:47 +05:30
322964f0e6
Switch to explicit `interface_key` values instead of char.
2017-10-17 16:06:33 -06:00
3c564c64ba
Fix tabs.
2017-10-17 15:17:35 -06:00
d009022311
Add tree product exclusions to autochop
2017-10-17 13:43:20 -06:00
cc595d7a4e
Fix fencepost error in orders import. Fixes #1177 .
2017-10-16 14:01:23 -05:00
c080da3750
listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux
2017-10-08 19:54:51 -06:00
c2b36f0979
Removed extra qualification to make Travis happy.
2017-09-01 17:29:55 +02:00
8a81f6b5f7
Removed extra qualification to make Travis happy.
2017-09-01 17:14:21 +02:00
596296358f
Moved all externally visible operation implementations out of name spaces to satisfy both Travis and Visual Studio.
2017-09-01 17:00:14 +02:00
84eaf04148
Removed function qualifications to make Travis happy and Visual Studio unhappy.
2017-09-01 16:22:10 +02:00
83061cffca
Replaced include of dfhack.h with <utility> and DataDefs.h
2017-09-01 15:37:40 +02:00
831fa07fb2
Removed path from dfhack.h include.
2017-09-01 15:10:53 +02:00
80fe49b339
Add embark-assistant plugin
2017-09-01 14:13:34 +02:00
ca481fc69f
max_barrels was serialized on max_bins position
...
When I save and load stockpile settings with stockpile management plugin, then saved barrels count will be loaded in bins and barrels are zero. So I think this change should correct it.
2017-08-28 22:33:24 +02:00
54b0d2fcb6
Merge pull request #1154 from JapaMala/master
...
RemoteFortressReader updates.
2017-08-22 10:48:47 -04:00
a7b837f2d0
Increment version number
2017-08-20 20:44:55 +05:30
8e71cf9def
Send Unit inventories with RFR
2017-08-19 17:48:18 +05:30
737aefefea
send over beard styles
2017-08-19 09:38:56 +05:30
5b5ac7088d
correct spelling
2017-08-12 19:12:14 +05:30
b7783ba8b9
Added unkept hair to style list
2017-08-12 19:10:35 +05:30
620cfcc8bd
Fix luasocket receive with byte count
...
Did not correctly detect when you typed in a number instead of pattern.
2017-08-12 15:42:56 +03:00
6c5e25db13
Add hair style to units in proto
2017-08-11 13:50:30 +05:30
55d22855a0
Add styling enums to RFR
2017-08-11 10:21:40 +05:30
95aa5bbb47
zoom: fix MSVC warning
2017-08-07 15:06:00 -04:00
1bf64ddfd8
Merge remote-tracking branch 'ab9rf/labormanager-1115' into develop
2017-08-07 14:04:05 -04:00
14867c36cc
Merge remote-tracking branch 'ab9rf/labormanager-1106' into develop
2017-08-07 14:00:37 -04:00
eb7e9dcf1f
Merge remote-tracking branch 'ab9rf/labormanager-1103' into develop
2017-08-07 14:00:15 -04:00
05b238c879
Fix another diggingInvaders compiler error
...
Windows-specific, for some strange reason
Ref #1145
2017-08-07 09:30:27 -04:00
a383cc9a30
Fix diggingInvaders compilation errors ( #1145 , GCC 4.8)
2017-08-06 21:01:36 -04:00
ab8fb9f44e
whitespace
2017-08-05 21:48:41 -05:00
b61859a55e
labormanager/#1103: fix NPE in meeting test
2017-08-04 11:29:48 -05:00
04733827a0
Favor/disfavor RECOVER_WOUNDED based on ALTRUISM ( fixes #1106 )
2017-07-29 19:54:51 -05:00
d98fd02048
Weight CUTWOOD jobs by KILL_PLANT ethic; fix #1115
2017-07-29 18:46:45 -05:00
682d4b3144
whitespace
2017-07-29 12:26:32 -05:00
fe9454ff1c
Fix #1103 : do not idle for a meeting if the other participant is dead, asleep, resting, or on military duty
2017-07-29 09:26:19 -05:00
c5c80d5dc0
Rename labormanager_joblabormapper to joblabormapper
2017-07-28 23:03:23 -05:00
d810faa4a3
whitespace
2017-07-28 02:43:32 -05:00
a7d21fd627
move labormanager into a subdirectory
2017-07-28 02:28:16 -05:00
8ae7a1235d
Add rider ID to creatures
2017-07-27 18:41:46 +05:30
92a962a9c0
Send grass levels over RemoteFortressReader
2017-07-25 08:31:02 +05:30
fd19935fe9
labormanager: remove stupid
2017-07-22 04:54:05 -05:00
15ae72edec
labormanager: Refactor source, separating the job labor mapper into a separate source file.
2017-07-22 04:31:30 -05:00
90dd9e932e
exclude on-duty military personnel from health labor check
2017-07-20 03:54:00 -05:00
1ee5debfba
Send the existence of all buildings on the map.
2017-07-17 15:29:23 +05:30
c5fad31a4c
Fix indentation
2017-07-12 16:55:50 -04:00
bdc746f3f1
Replace broken include guard
2017-07-12 16:53:09 -04:00
018f3be70a
Merge remote-tracking branch 'JapaMala/master' into develop
2017-07-12 16:52:30 -04:00
f963d89e12
Merge branch 'develop' into plugin-orders
2017-07-11 15:12:40 -05:00
070dfa1865
Merge branch 'develop' of dfhack/dfhack into develop
2017-07-05 23:57:35 -04:00
2d07e5edea
Add new "pathable" plugin
2017-07-05 23:54:55 -04:00
03772a6899
Don't support windmill direction on old DF
2017-07-04 21:10:59 +05:30
8a0777bb1e
Add stdint.h to the buildingreader header.
2017-07-04 20:51:25 +05:30
069cea675c
Split import and clear into two commands. Use for-each loops for clarity. Closes #965 .
2017-07-02 16:00:45 -05:00
7b3ce20167
Add orders plugin for managing manager orders.
2017-07-02 14:02:55 -05:00
fd68971ac5
Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches
2017-07-02 07:31:31 -06:00
96dd5799f7
Add compatibility defines for 0.34.11
2017-06-30 01:00:31 +05:30
967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active.
2017-06-27 13:47:33 -05:00
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
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
c9b5df8989
Merge develop
2017-06-24 11:00:14 +05:30
52b9a8f4ad
Added a function to get a subset of the plant raws.
2017-06-24 10:52:09 +05:30
bf8e65311b
Update submodules
2017-06-23 12:43:38 -04:00
31dbb792ca
Added a function to get a partial creature raw list.
2017-06-23 19:54:22 +05:30
a2f6c80298
Add compatibility defines to remotefortressreader.cpp
2017-06-23 16:02:30 +05:30
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
ac0134568e
Don't read empty rooms, and update version
2017-06-22 23:57:04 +05:30
34f55cec29
Merge remote-tracking branch 'origin/master'
2017-06-22 20:29:21 +05:30
0348de4880
Add a command to get the current RemoteFortressReader version
2017-06-22 20:29:10 +05:30
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
48f5fd7a39
Fix missing room info on sent buildings.
2017-06-20 11:06:37 +05:30
96f9faea28
Merge remote-tracking branch 'DFHack/develop'
2017-06-20 10:51:52 +05:30
3da9176c76
Update submodules
2017-06-20 10:51:41 +05:30
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
1321a64613
Remove lots of old/unused functions from the Units module
2017-06-10 17:21:34 -04:00
acf50b755f
tweak hotkey-clear: fix label position
2017-06-08 11:20:56 -04:00
a19e268923
Make re-invoking command-prompt hide the current prompt
2017-06-07 15:00:30 -04:00
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
b2f05834d9
buildingplan: fix an issue preventing some numbers from being used in names
2017-06-03 18:25:49 -04:00
9f18cb5bdc
resume: use map y dimension and fix off-by-one error
2017-06-03 11:24:23 -04:00
5278856b37
mousequery: Fix parameters to getDepthAt()
2017-06-02 15:39:23 -04:00
62c9f2695a
automaterial: use uicommon.h, draw to map
2017-06-02 15:00:51 -04:00
43c4a88068
Move some checks in paintTile/readTile after hooks are called
2017-06-02 00:40:14 -04:00
044b3a0789
resume: use uicommon and draw to map
2017-06-01 16:19:11 -04:00
2681392e27
siege-engine: use map tiles
2017-05-31 12:12:52 -04:00
9f2eaf35f1
Merge remote-tracking branch 'DFHack/develop'
2017-05-31 19:52:53 +05:30
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
49ea61562f
uicommon: remove nullptr definition
...
This is available in GCC 4.8+ and MSVC 2015
2017-05-25 18:06:51 -04:00
addbb1a94f
(Hopefully) send active-state wil all applicable buildings.
2017-05-25 15:38:31 +05:30
2d6dab0f24
Add a special case for retraction bridge direction
2017-05-23 21:41:34 +05:30
3f98cd3da0
Add active state to some building types.
2017-05-22 22:03:12 +05:30
22de28c3ed
embark-tools sand: hide indicator when it overlaps with confirmation window
2017-05-19 11:49:25 -04:00
b92095190f
Update stonesense, scripts, xml
2017-05-18 20:52:41 -04:00
5831665231
Fix wrong units used between two bounding boxes.
2017-05-14 16:07:05 +05:30
4ec42f7994
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2017-05-14 11:17:09 +05:30
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
d083b92e9c
probe: display tiletype enum names as well
2017-05-10 12:40:57 -04:00
d42bfd7a1d
Merge remote-tracking branch 'quietust/develop' into develop
2017-05-10 10:28:49 -04:00
5d9a3cdc99
Merge branch 'develop' of dfhack/dfhack into develop
2017-05-09 13:51:38 -04:00
88f9eaeebb
stonesense: Disable overlay in STANDARD-based modes
...
Closes dfhack/dfhack#1078
2017-05-09 13:50:08 -04:00
4dff218976
ruby: fix crash when unloading plugin on Windows
2017-05-09 13:49:07 -04:00
67e60fdaa1
Fix issue #874 (revflood doesn't always see past constructed downstairs)
2017-05-07 13:23:33 -06:00
de7ef79d76
Merge remote-tracking branch 'DFHack/develop' into develop
2017-05-07 19:24:39 +05:30
a1f692686a
Use forward slashes instead of underscored to separate building subtypes
2017-05-07 19:24:30 +05:30
d309839b74
Update stonesense - fix #1083
2017-05-06 15:15:32 -04:00
3dc2c2259b
Update getplants to use Designations module
...
Fixes #531
Fixes #1014
Fixes #1018
2017-05-06 00:11:07 -04:00
adaccceba7
autochop: fix display of unnamed burrows
2017-05-05 17:36:02 -04:00
5c784f4ba3
autochop: Avoid moving menu options around when toggling burrows
2017-05-05 17:31:54 -04:00
a527091172
autochop: Fix marking/unmarking trees (use Designations module)
...
Fixes #656
Fixes #1076
Closes #1030
2017-05-04 21:51:16 -04:00
690fec9d81
manipulator: show social activities in job column
2017-04-28 17:26:20 -04:00
3cfbd735dc
Update xml, stonesense, scripts
2017-04-23 17:14:22 -04:00
098481c60d
Merge branch 'develop' of dfhack/dfhack into develop
2017-04-19 13:45:45 -04:00
06737644cd
new tweak: hotkey-clear
2017-04-19 13:31:25 -04:00
e36e4fa1c1
Support archery target rotation in RemoteFortressReader
2017-04-05 15:35:48 +05:30
06225dd896
Send building items and items kept in buildings separately.
2017-03-30 16:23:14 +05:30
7c626ba3c2
Actually add the versionInfo function to the RPC list.
2017-03-29 22:05:49 +05:30
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
f4ce45deae
Disable confirm note-delete in name entry
...
Fixes #820
2016-02-11 22:56:33 -05:00
83c70ccb0f
forbid manipulator editing non-citizens
2016-02-11 13:31:52 +02:00
ac070e49a4
forbid manipulator editing visitors
2016-02-11 06:24:18 +02:00
3cab865d58
fix manipulator racism
...
(allow editing non-dwarves)
2016-02-11 06:23:30 +02:00
ff4b2f8522
add new skill columns
2016-02-11 06:23:21 +02:00
5d8c2fd502
Fix whitespace
2016-02-02 01:14:04 -05:00
3e402fa97c
Remove left over handlers from eventful
2016-02-01 22:23:31 +02:00
e4ae1c11f5
Update eventful's produce hook to new vmethod. Also make all events use no-handler version thus removing lot of unused functions (and empty function calls).
2016-02-01 22:23:29 +02:00
0a670bb0db
Implement #804 , move some functions to Units, colorize zone output, a
...
little cleanup
2016-02-01 11:12:06 -05:00
297f441bd6
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-01 20:01:00 +05:30
054954a72a
Corrected the region details logic.
2016-02-01 20:00:25 +05:30
e519313b70
Convert colonies plugin to script, add place feature
2016-02-01 18:12:38 +11:00
afa1199f98
Add support for grates and bars to Ruby.
...
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
248331a196
buildingplan: Support floodgates, grates, bars
...
See #808
2016-01-31 14:50:07 -05:00
d063155b87
Merge pull request #808 from BenLubar/benlubar-floodgate-alloc
...
Fix floodgate allocation in C++/Lua and well and pressure plate allocation in Ruby.
2016-01-31 14:20:46 -05:00
e49745d338
Added tile and material to growths in remotefortressreader.cpp
2016-02-01 00:41:13 +05:30
197e5ca2d9
update the name of the pressure plate field in ruby
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L365-L371
2016-01-30 08:46:16 -06:00
aab5c61923
set well bucket z correctly when allocating it in ruby
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L347-L352
2016-01-29 14:51:32 -06:00
7f3191352c
send growth info through remotefortressreader.cpp
2016-01-28 00:06:10 +05:30
4c4eda44f9
Added plant raw list to RemoteFortressReader.proto
2016-01-27 18:49:30 +05:30
a7b2d5e38f
Fix autogems typedefs for MSVC and log errors to stderr
2016-01-16 11:45:04 -05:00
15a9d7f491
Fix whitespace
2016-01-14 20:13:46 -05:00
f02a504a00
Added tree coords to remotefortressreader.cpp
2016-01-12 00:10:16 +05:30
ed62f0f554
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-01-10 12:47:03 +05:30
ebf2dada62
Increased DF version define
2016-01-10 12:37:52 +05:30
004f46fecc
Merge pull request #789 from eswald/autogems
...
New autogems plugin, automatically cutting rough gems.
2016-01-09 19:10:30 -05:00
5f03bb743f
Increasing autogems checks to once per day.
...
A legendary gem cutter couldn't quite clear a full suite of jobs before the next check, but it was a close call sometimes.
2016-01-09 16:47:06 -07:00
7c9002c4ea
Avoid overwriting dynamic lines.
...
Even vanilla DF has three additional workshop order lines that only show up with modded raws.
2016-01-09 14:47:00 -07:00
7041e49196
Merge pull request #785 from abbradar/develop
...
blueprint: fix compilation (i.e. undefined find)
2016-01-09 13:57:17 -05:00
53780d8232
New autogems plugin, automatically cutting rough gems.
2016-01-08 23:18:41 -07:00
d670ee8ab4
New tweak: block-labors
...
Prevents labors that can't be used from being toggled
Suggested at http://www.bay12forums.com/smf/index.php?topic=121451.msg6719464#msg6719464
2016-01-08 19:27:11 -05:00
97fb50c28f
Add better support for default ListColumn values
...
This is only necessary for multiple-selection columns, and there aren't any
with non-pointer entry types currently, but casting nullptr to non-pointer types
isn't a great idea.
2016-01-06 17:30:07 -05:00
da3c6404fa
blueprint: fix compilation (i.e. undefined find)
2016-01-06 03:03:19 +03:00
3bcd58fca7
Use consistent key display
2016-01-04 19:31:57 -05:00
2acdede03b
New tweak: hide-priority
...
Adds an option to hide designation priority indicators
2016-01-04 19:29:30 -05:00
9e020bb8c1
Make title-version show git info for dev builds
2016-01-01 11:50:11 -05:00
81b055ee93
Implement "weather" as a script
2016-01-01 11:35:58 -05:00
d0c28d3f50
Prevent plugins with active viewscreens from being unloaded
...
This requires plugins to pass plugin_self to Screen::show(), but
avoids the need to implement special checks in plugin_onstatechange
for the SC_BEGIN_UNLOAD event.
2016-01-01 11:15:29 -05:00
d775333c00
fix-unit-occupancy: Account for wagon occupancy correctly
...
Previously, non-central wagon tiles would have their occupancy flag
cleared.
2015-12-31 13:38:38 -05:00
2ef24a3daf
Prevent nested command invocations in command-prompt
...
For example, running "devel/send-key SELECT" in command-prompt would
blow up the stack by recursively calling submit()
2015-12-27 22:35:14 -05:00
e075a06486
Add search controls to all viewscreen_petst subpages
2015-12-27 15:49:10 -05:00
05926d9734
New tweak: title-start-rename
...
Adds a safe rename option to the title screen "Start Playing" menu
2015-12-26 11:47:58 -05:00
a9ad2f40f1
Add a location retirement confirmation
2015-12-25 11:18:55 -05:00
de160de0e8
showmood: use correct console encoding
2015-12-24 21:34:38 -05:00
15a6eb90d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-12-24 22:14:18 +05:30
10eed10b63
Add genger do remotefortressreader.cpp
2015-12-24 22:13:25 +05:30
e3e68a8df9
Add a search option to the location occupation menu
2015-12-23 16:57:43 -05:00
2a2ab00ca9
Add "map" parameter to a lot of drawing functions
...
Ref #746
2015-12-22 11:42:51 -05:00
c9eab65c96
Fix more produce() calls
2015-12-22 09:54:00 -05:00
e3420a5e67
Merge pull request #770 from eswald/instruments
...
Stockflow repairs
2015-12-19 23:11:55 -05:00
f0013ced56
tabs to spaces
2015-12-19 11:16:43 -05:00
5a1e5e1464
Expose Units::casteFlagSet()
2015-12-19 11:07:35 -05:00
15d3815f26
Merge remote-tracking branch 'quietust/develop' into develop
2015-12-19 10:58:38 -05:00
e7d8f9b2b3
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-12-18 18:42:39 -05:00
55d5706a21
Update structures and fix various issues with plugins producing items
...
reaction_product::produce() takes a new unidentified vector<void*>*.
Passing a reference to an empty vector appears to work.
2015-12-18 18:40:11 -05:00
4dc94a565f
Adjusting stockflow order numbers where possible.
...
Loading 0.40 saves in 0.42 results in a different list of reactions. Fortunately, all but the instruments should still work.
2015-12-18 07:02:29 -07:00
45625318bb
Stockflow reaction list repairs.
...
Mostly, instruments and their pieces are made through generated custom reactions, instead of as tools.
Depends on df-structures commit e551233 for full potency.
2015-12-17 22:02:30 -07:00
e4de341168
Preparing for MakeInstrument elimination.
...
Instruments are now made individually, so this type of job no longer happens. Therefore, it will probably be removed from the job_type enum.
2015-12-17 21:45:43 -07:00
270ff61fbd
add parentheses around || that should be inside &&
2015-12-13 12:23:56 -06:00
7ef815afa8
apparently, casteFlagSet is a static function, despite its usefulness...
2015-12-12 17:58:58 -06:00
eb1092da6e
Update strangemood plugin according to actual game code
2015-12-12 13:46:35 -06:00
3083b01525
Add new labors to manipulator
2015-12-12 11:26:45 -05:00
78d6b92127
Change strangemood permitted skill checks to job checks
...
permitted_skills was removed in 0.42 (dfhack/df-structures@6e2e8731 )
2015-12-12 11:17:00 -05:00
817ea5e01c
Add new labors to autohauler/autolabor
2015-12-09 20:03:35 -05:00
1668984585
UNITJOB_VIEW -> UNITJOB_VIEW_UNIT
2015-12-04 23:12:37 -05:00
23a5ce69bf
Send unit names over remotefortressreader
2015-11-29 00:03:26 +05:30
df61233774
Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop
2015-11-26 16:13:27 -05:00
55397425ef
Only call fix-job-postings automatically when workflow is enabled
...
Also, don't consider dead postings problematic
2015-11-26 10:34:46 -05:00
2700b01765
Ensure that the correct job posting is kept (if there is one)
2015-11-25 23:35:19 -05:00
428a0a4cfe
fix-unit-occupancy: Handle invalid coordinates instead of crashing
...
It appears that positions of caged units brought by traders can be
invalid, in particular.
2015-11-25 22:32:54 -05:00
ff677d12ba
Merge remote-tracking branch 'lethosor/confirm-lua' into develop
2015-11-25 20:41:07 -05:00
2aeac718cc
workflow: Account for job postings correctly and fix existing issues
...
Without removing postings correctly, it was possible to end up with
multiple workers assigned to a job that workflow had suspended
multiple times, which caused crashes if more than one worker was
assigned to the same job by DF.
This adds an additional command, fix-job-postings, that runs
automatically when loading a world and fixes:
- Multiple job postings that point to the same job
- Job postings that point to a job where posting_index == -1
(i.e. jobs that should have no posting assigned)
Fixes #741
2015-11-25 20:33:13 -05:00
af92b3ae1f
Fix some confirm plugin issues and add a simple configuration UI
...
- Detect null pointers in trade-related functions
- Fix typo/issues pointed out by @dscorbett
- Reorder includes
2015-11-21 20:58:49 -05:00
b7dd93b6e8
Implement most of the confirm plugin in Lua
...
This should make resolving future issues easier, although implementing
new confirmations in lua isn't possible yet (each one requires a line
in confirm.cpp).
This also resolves an issue with note-delete and route-delete, with
dfhack/df-structures@1bc4f61
2015-11-21 19:01:35 -05:00
67aed56183
Allow adding plugins temporarily without modifying plugins/CMakeLists.txt
...
Useful to avoid issues when switching between branches that modify
plugins/CMakeLists.txt
2015-11-17 17:42:03 -05:00
842b9c5191
Implement feature as a script, add magma option
...
Functionality is exactly equivalent to the plugin, but with a new option
for players who want to enable magma furnaces without spoilers.
2015-11-17 16:43:56 +09:30
2ba9ef04e3
Replace drybuckets plugin with a script
...
Also closes #248 , by checking job and building flags.
2015-11-17 13:55:43 +09:30
9c4fc64ac5
Fix display issue in tweak max-wheelbarrow
2015-11-16 21:47:29 -05:00
16b2140dec
Merge remote-tracking branch 'lethosor/fix-unit-occ-speed' into develop
2015-11-16 21:39:46 -05:00
5f8f0c72aa
Remove dwarfexport plugin (obsolete)
...
The Runesmith utility has long been replaced by Dwarf Therapist, and
it's attribute-editing functions are very well supported directly by
DFHack.
2015-11-17 11:13:22 +09:30
836e1a3a37
Remove mapexport plugin (obsolete)
...
It's been disabled for more than a year, and nobody misses it. If that
changes, it'll still be in the git history!
2015-11-17 11:13:21 +09:30
291787a019
Remove df2mc plugin (obsolete)
...
It's still got it's own repo, but it hasn't been compatible with
Minecraft for years and shouldn't be in the DFHack repo.
2015-11-17 11:13:20 +09:30
80e4b8d3df
Remove DFusion plugin and script system
...
It's been four years since meaningful updates, and in that time
alternatives have emerged to almost everything. Any remaining
functionality to replace is on the issue tracker.
Simpler is better, for users and developers, and removing a legacy
system makes it easier to understand how DFHack works.
2015-11-17 11:13:19 +09:30
7ea0e198b3
fix-unit-occupancy: Only check unit list once
...
Fixes #749
2015-11-16 17:25:21 -05:00
610170b0b0
Add hooks for getDwarfmodeViewDims and getDepthAt (new)
2015-11-15 11:54:34 -05:00
fcfffd1cb6
Track state of gui hooks
...
Also fix a bug in drawborder() and expand color-dfhack-text to test
multiple hooks
2015-11-15 11:54:34 -05:00
fff9072b07
Add initial support for hooking into Gui-related functions
2015-11-15 11:54:34 -05:00
928bcb6d95
military search: Don't try to pass selection in empty list to DF
...
Fixes #748
2015-11-15 11:15:05 -05:00
9273c177c1
Add "confirm uniform-delete"
2015-11-11 23:14:58 -05:00
07a310b0f2
Prevent "confirm squad-disband" from triggering unnecessarily
2015-11-11 23:14:30 -05:00
e7c3b03ada
Misc. confirm plugin cleanup
...
This avoids the need to list newly-added classes in multiple places
(which could be extended to the search plugin) and gets rid of a few
ugly macros, along with a few other minor changes.
2015-11-11 23:00:20 -05:00
7663a9a7a7
confirm haul-delete: Additional UI state restrictions
...
Fixes #744
2015-11-10 17:24:10 -05:00
97e9312d2a
Update stonesense
2015-11-08 21:17:07 -05:00
79e1c4982e
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-08 13:54:14 +05:30
4db05cc8eb
Add Unit size info to remotefortressreader.cpp
2015-11-08 13:05:25 +05:30
047168b702
Fix workshop/furnace sidebar events
2015-11-07 16:15:37 -05:00
8117549175
Merge remote-tracking branch 'warmist/patch-6' into develop
...
Add furnace to fillsidebarmenu hook
2015-11-07 16:04:05 -05:00
e176c3ea05
Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop
2015-11-07 15:50:11 -05:00
ba0ae9e487
Merge remote-tracking branch 'PeridexisErrant/init-flags' into develop
2015-11-07 15:23:17 -05:00
0bb203e7c9
Replace initflags plugin with scripts
...
Progress towards #722
2015-11-07 23:42:14 +11:00
3ebe59859b
box-select: Fix "tiles to fill" count
2015-11-06 20:04:54 -05:00
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05:00
7f212178ca
Move unused docs to plugin source files
...
This way they can easily be restored when the plugins are reactivated,
but don't confuse users until then.
2015-11-07 10:13:21 +11:00
e9be1aa657
Fix for construction over existing construction & on top of walls
...
Fix to allow constructions on top of (natural) down stairs
2015-11-06 19:00:43 +01:00
5c4e28dbff
Fix initial cursor position with initial entry
2015-11-05 19:09:35 -05:00
ac8038fa79
Update stonesense
2015-11-04 20:06:35 -05:00
cbf31dcb37
Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop
2015-11-04 19:54:13 -05:00
ea38404727
Added bridge direction.
2015-11-03 22:38:07 +05:30
0fa35aef3c
Update eventful.cpp
...
Fix furnace hook not being called.
2015-11-03 18:01:41 +02:00
a503e54484
Add furnaces to sidebar fill event
2015-11-03 17:59:24 +02:00
3fd4b01829
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-03 18:50:00 +05:30
f5ca3f9e7b
Made the direction info more meaningful.
2015-11-03 18:49:17 +05:30
d692458038
Formatting
2015-11-03 10:07:27 +01:00
f7a5574e9a
Merge pull request #726 from DoctorVanGogh/zone-typo
...
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
923ce36323
zone: Fix typo in help text
2015-11-03 03:55:04 +01:00
b4b90465c2
Added building direction to remotefortressreader.cpp for those buildings that have it in a meaningful way.
2015-11-02 23:22:58 +05:30
a7fe1d9d73
Formatting
2015-11-02 05:05:17 +01:00
092979f362
Prevent building floor on top of constructed floor (mostly)
2015-11-02 02:51:52 +01:00
e11ce3bff4
Merge develop
2015-10-31 15:46:41 +11:00
ac71fa8070
Add isValidLabor() to Units module
...
Closes #711 and could avoid potential issues when editing units from
other civs with manipulator.
2015-10-30 18:41:09 -04:00
ff4f7203c5
Update stonesense
2015-10-30 17:08:39 -04:00
daf20c16bd
Indicate development builds
2015-10-24 14:52:00 -04:00
8de710f1c1
Add Renderer module - safer way to install custom renderers
2015-10-21 17:18:39 -04:00
757c05db86
buildingplan-lib: depend on dfhack
2015-10-18 17:46:37 -04:00
dd32954cce
Make buildingplan-lib a static library
...
This avoids building buildingplan-lib.cpp multiple times
2015-10-18 13:08:48 -04:00
c44ac8ec6e
Improve handling of fatal errors and errors in dfhack.lua
...
* Several fatal errors that occurred during core initialization didn't
stop initialization or set 'errorstate' properly, which caused
update hooks and other code to crash later. This has been fixed and
should address crashes like the one mentioned in #470 .
* Errors when loading dfhack.lua now cause Lua::Open() to fail, which
triggers a fatal error in Core::Init()
* Failure to initialize the console no longer results in a call to
fatal() (since it didn't actually stop initialization previously)
2015-10-17 21:18:04 -04:00
38be023d5d
Fix TiletypeMaterial/tiletype_material comparison
2015-10-10 13:06:14 -04:00
46f6afada7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-10-09 23:35:39 +05:30
30c14ed914
send stockpile and civzone extents in remotefortressreader.cpp
2015-10-09 23:35:12 +05:30
5580a255f5
Update stonesense
2015-10-03 14:42:52 -04:00
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
d343dfd8a0
Add a function to find viewscreens (or parents) of a given type
...
This makes it possible for some plugins to detect the game state more
reliably - for example, prospector would previously fail when
embarking if the viewscreen_choose_start_sitest instance had any
children.
2015-10-02 21:50:55 -04:00
449e0c7578
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-28 10:07:23 +05:30
5e43b6b2a6
Add buildigs to remotefortressreader.cpp
2015-09-28 10:06:04 +05:30
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
62c903b7be
search: Fix crash when disabling a stockpile category
...
Closes #678
2015-09-21 19:25:20 -04:00
b532a56790
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-21 17:48:34 -04:00
47378d4b85
Merge branch 'luasocket' into develop
2015-09-21 17:46:47 -04:00
fabcfcd921
Fixed trailing whitespace.
2015-09-21 17:42:30 -04:00
129218d5f8
fix whitespace.
2015-09-16 23:29:21 +05:30
ed07a8478b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-16 23:27:04 +05:30
e49272854c
Add basic army info to RemoteFortressReader.proto
2015-09-16 23:26:52 +05:30
5ce6fceacc
Send the center with the world map, based off current embark if available, otherwise adventurer position.
2015-09-16 23:25:23 +05:30
80fd4b1365
Some additions and fixes.
...
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
f9fce7e6a1
Convert tab to spaces in RemoteFortressReader.proto.
2015-09-15 03:21:09 -04:00
b58ccc9e55
Fix embark-tools title alignment
2015-09-12 20:28:42 -04:00
a852ca10d7
Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop
2015-09-12 19:59:53 -04:00
3b36a23404
Add soldier state to remotefortressreader.cpp
2015-09-07 22:41:24 +05:30
07c601be99
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
1a78cabd7c
Add profession color and unit flags to remotefortressreader
2015-09-05 14:54:12 +05:30
1ea2da511b
Fix whitespace
2015-09-02 15:53:13 -04:00
44a670db4d
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-03 00:14:31 +05:30
6881aeac70
Enable sending of creature_raw in remotefortressreader.cpp
2015-09-03 00:13:48 +05:30
7437400c18
command-prompt: Prevent unloading when prompt is active
2015-08-29 19:38:41 -04:00
c6ae3e11fd
Rename remotefortressreader to RemoteFortressReader
2015-08-26 16:40:59 -04:00
8292f56f63
New tweak: embark-profile-name
2015-08-25 10:12:31 -04:00
ec4a3bda54
Merge branch 'develop' into plugin-manager
2015-08-17 08:17:56 -04:00
7639420455
Update luasocket.lua
2015-08-17 10:07:20 +03:00
bf7fc42710
Made remotefortressreader.cpp get the elevations from the next region over for the last line.
2015-08-17 00:11:52 +05:30
f60b3e8117
Added a function to get region tiles from remotefortressreader.cpp
2015-08-16 20:28:52 +05:30
5bb69cfe04
Add luasocket to CMakeLists.txt
2015-08-15 15:12:13 +03:00
d9c50d677f
A lua interface for csockets in a spirit of luasocket
2015-08-15 15:09:12 +03:00
735498c3f9
Fix merge conflict
2015-08-14 16:23:39 -04:00
4fc6cb6f17
Several PluginManager improvements
...
* load/unload/reload are no longer restricted to plugins that exist
on startup
* Names passed to DFHACK_PLUGIN must match the plugin's filename
(remotefortressreader vs RemoteFortressReader, counters vs probe)
* "plug" output lists all plugins and state/command information
* Deleted plugins can be reloaded again if they are replaced
* load/unload/reload don't fail silently with broken plugins
* Built-in commands are recognized internally (e.g. "help help"
does not display "help is not a recognized command"), although help
for them is not yet implemented
* New command: "type" (bash-like) - shows where/how a command is
implemented
* "plug" can accept multiple plugin names
* "ls" displays more information about unloaded/unrecognized plugins
* "load all" changed to "load -all" (or "load --all", "load -a", ...)
2015-08-14 16:11:23 -04:00
a71a6d45cc
Added a function to pull the world map from remotefortressreader.cpp
2015-08-14 15:36:36 +05:30
22374e6d86
Fixed remotefortressreader.cpp DF version detection.
2015-08-13 15:59:15 +05:30
e4ac25d1e0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-08-13 11:26:33 +05:30
a60c8d8e7c
Added conditionals to remotefortressreader.cpp to make compiling for v 0.24.11 easier.
2015-08-13 11:25:59 +05:30
05f36856f4
fix-unit-occupancy: Always provide feedback when running command
2015-08-10 11:30:21 -04:00
9b5f42e3a9
tweak farm-plot-select: Only show controls when plots are fully built
...
Fixes #521
2015-08-10 10:41:47 -04:00
fcd15bfd73
Move vshook plugin to title-version and enable by default
2015-08-09 13:37:26 -04:00
bce9d98633
New plugin: fix-unit-occupancy (fixes bug 3499)
2015-08-07 14:33:38 -04:00
44287fc3a0
remotefortressreader: Check map validity before reading map info
...
Fixes JapaMala/armok-vision#5
2015-08-06 13:42:13 -04:00
090f542d49
Allow for per-plugin compile flags
2015-08-06 13:33:53 -04:00
bc5b46dce0
Merge pull request #660 from lethosor/jsoncpp
...
Replace jsonxx with jsoncpp
2015-08-06 12:37:51 -04:00
e02815dc30
Fix manipulator crash when selecting from empty custom profession list
2015-07-31 16:46:00 -04:00
01e04c24c5
Use a separate lua state in dwarfmonitor render hook
2015-07-31 14:25:33 -04:00
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
a90f3c3d67
stockpiles: Restrict characters in filenames when saving
...
Previously, it was possible to save outside of the stocksettings
directory or fail to save in a nonexistent subdirectory (e.g. when
a stockpile name had slashes in it).
Resolves #621
2015-07-29 14:17:14 -04:00
4e45cc5bbb
stocks: Use ^ and $ to match the beginning/end of item names
...
Closes #624
2015-07-29 13:44:32 -04:00
7fc682b199
Fix dismissal of current screen when zooming to items
2015-07-29 11:22:38 -04:00
825d46af51
Move ListColumn class to a separate header
2015-07-28 21:48:00 -04:00
dd7c20c848
Add safer helpers to get STRING_X keys from interface_key sets
...
A few plugins were using input->rbegin() previously, which crashes
if input is empty and isn't strictly guaranteed to return a
STRING_X key.
2015-07-28 18:34:29 -04:00
b73e859a37
Reorganize stocks viewscreen to fit a 25-row resolution
2015-07-28 14:37:49 -04:00
5ca5feb855
Stop embark-tools from crashing on unload
...
Also enable sand indicator and mouse controls by default and refactor
2015-07-27 21:38:53 -04:00
c3c625e7bd
Remove embark-tools nano (implemented in 0.40.24)
2015-07-27 18:22:18 -04:00
889c76b147
buildingplan: Don't assume building and item type names match
...
There are a few building types (e.g. hatch covers) where this is not
the case.
Fixes #604
2015-07-27 14:10:55 -04:00
6352a6e266
Expand confirm plugin and improve safety of adding/removing hooks
...
* New option: trade-select-all: Prompts when selecting all goods
when some goods are already selected
* Improved trade confirmation message depending on selected goods
* Made seize and offer confirmations only display when goods in the
appropriate columns are selected
* States of each option are now listed by "confirm help"
2015-07-27 12:03:29 -04:00
ed3cbe2e60
Add several trade-related confirmations
2015-07-27 10:05:59 -04:00
35f229c578
Add confirmations for hauling route/stop deletion and depot removal
2015-07-27 10:05:59 -04:00
175edf501a
Add "confirm" plugin - implements a few confirmation dialogs
...
See #577
2015-07-27 10:05:59 -04:00
f1a6e5fbe9
tweak farm-plot-select: Don't require crops to be discovered
...
Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
2015-07-24 11:17:04 -04:00
6c55164be4
Fix a potential crash in tweak farm-plot-select
...
Related to #396
2015-07-24 10:54:59 -04:00
867e78b6fd
Correctly identify ice material.
2015-07-04 09:22:41 +05:30
87b1524aec
search: give text input priority over cursor keys
2015-06-30 16:45:45 -04:00
8058472dd9
Check for null pointers in several places in the search plugin
...
Fixes #650 (and a few other potential issues)
2015-06-30 16:20:01 -04:00
2c734233eb
New tweak: kitchen-keys
...
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614
See #526
2015-06-27 11:02:26 -04:00
3795edb673
Fix colors in 'tweak kitchen-prefs-color'
2015-06-27 09:54:31 -04:00
4246dbd02a
New tweak: kitchen-prefs-color
...
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
8d21dd0a23
New tweak: kitchen-prefs-empty
...
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000
See #526
2015-06-26 23:19:39 -04:00
38d377f4c4
Fix a few zone plugin crashes
...
* Avoid checking building types of null pointers
* Detect selected cages properly
Fixes #646
2015-06-23 21:21:21 -04:00
c9f7fcfd05
Merge pull request #640 from lethosor/search-look-list
...
Add look menu search
2015-06-22 08:44:34 -04:00
33cb5e951f
Fixed whitespace and returns.
2015-06-22 18:01:19 +05:30
a071f5bf6c
Added preliminary building list to remotefortressreader. Untested.
2015-06-22 00:40:17 +05:30
96640c837f
Made remotefortressreader send an item list, and the item that constructions are made from.
2015-06-20 22:17:35 +05:30
4182a30cc5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-19 23:30:47 +05:30
4b05423e58
Made remotefortressreader send proper indices for inbuilt materials.
2015-06-19 23:28:32 +05:30
a8480070a0
Add look menu search
2015-06-16 20:36:19 -04:00
81cba0b0fc
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-06-16 19:56:16 -04:00
8145a04944
dwarfmonitor: Add mouse cursor widget
...
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
93c9a41a3a
Reimplement dwarfmonitor widgets in Lua (and improve customizability)
...
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.
Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
no longer copied into the DF directory when building DFHack. This
keeps developers' personal settings intact, but will require
copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
772ad0372d
Improved issue with workflow job being resumed but never being worked
...
Fixes #487
* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue
* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field
This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
84b2f814e8
Disable some plugin output on startup
...
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
in dfhack.init-example
2015-05-16 18:23:02 -04:00
a577248a38
Make memview output more readable
2015-05-09 19:41:13 -04:00
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
a8f5e683f7
Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop
2015-05-09 09:39:55 -04:00
d0ba6d7019
Fix tweak fps-min
2015-05-08 17:35:46 -04:00
9c404a535d
Make search plugin intercept MOVIES and HELP keys
2015-05-08 16:27:52 -04:00
3001053cef
Change tabs to spaces.
2015-05-07 21:51:03 -07:00
7aac9a8fb8
Improve workflow handling of plant reactions
...
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.
Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.
This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
3da939bb02
Change tabs to spaces.
2015-05-07 20:41:11 -07:00
684ff433d4
Autolabor changes
...
Try harder to concentrate skill on certain dwarves, at the expense of
potentially allowing more idle dwarves.
Attempt to keep dwarves with tools from running off and doing other
things while holding on the tool so much.
Add comments explaining the two modes autolabor uses depending on number
of idle dwarves.
2015-05-07 20:37:01 -07:00
82202efb26
Don't reset disabled labors
...
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
a1fd1d9219
Document dwarfmonitor and allow date format to be modified
2015-04-19 12:38:37 -04:00
6187ac3054
Only initialize steam-engine when a fortress mode map is loaded
...
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.
Fixes #444
2015-04-02 17:17:29 -04:00
786581689f
Move get_dfhack_version() to a separate namespace and add a few other version-related functions
2015-04-02 16:37:58 -04:00
9b6d8d2799
Allow dev plugins to be skipped on startup
2015-04-01 17:50:22 -04:00
82d72007fc
Move zoom-related commands to a separate dev plugin
2015-04-01 17:24:52 -04:00
7913517b2c
Add "nyan stop" command
2015-04-01 17:02:33 -04:00
6779849bc6
This requires a return value in Windows, and really should have one anyway.
2015-03-29 14:21:59 -04:00
88c3a629d5
Fix vshook
2015-03-26 19:27:22 -04:00
f8d8baef39
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:04:52 -04:00
d182b6c1c3
only create the stocksettings directory when it is requested
2015-03-24 17:46:49 -05:00
a5b2b92b30
Merge remote-tracking branch 'eswald/stockflow' into develop
2015-03-24 16:05:48 -04:00
ff38a60d56
Merge remote-tracking branch 'lethosor/ui-tweaks' into develop
2015-03-24 15:53:36 -04:00
4fac0aff0d
Fix compile: missing include in plugins/manipulator.cpp.
2015-03-24 12:25:50 -04:00
4f963233f4
Enticing the bookkeeper to work more often
2015-03-20 19:23:04 -06:00
caed509d0b
Simply maniuplator professions by adding the text token to the SkillColumn entries
2015-03-19 03:30:03 -04:00
23707db1d3
Fixed ballistic arrow head orders
2015-03-15 16:38:59 -06:00
6bfaa8d35d
Better way to handle obsolete job types.
2015-03-15 16:37:35 -06:00
81c2a6e79f
Refactoring a table insert into reaction_entry.
2015-03-15 16:02:29 -06:00
11d65b4f2d
Always clear reactions when loading.
...
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
d18bd3e2a5
Preventing a stockflow error message in Arena mode
2015-03-15 14:08:47 -06:00
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
48b7c51027
Merge pull request #574 from melkor217/master
...
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
0c5b5c691a
Use gametype checks in plugins
2015-03-09 20:17:18 -04:00
c2eba99cb9
Create professions folder if necessary
2015-03-05 16:57:58 -05:00
efa9224eef
Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop
2015-03-05 16:55:30 -05:00
6f276ac419
Shorten option width to stay within 80 columns
2015-03-05 16:48:11 -05:00
4c06e022a6
Negative autolabor pool size uses most unskilled dwarves.
2015-03-06 00:47:18 +03:00
be2349d67d
Revert "Expose manipulator columns to Lua"
...
This reverts commit 1d8b2d8cea
2015-03-05 16:32:57 -05:00
8459959124
Add fps-min to dfhack.init-example and plugin help
2015-03-05 16:29:36 -05:00
83cb7b48f9
Add "fps-min" tweak and allow onupdate-based tweaks
2015-03-04 19:03:39 -05:00
abc60f53ad
Add `tweak shift-8-scroll`; misc. tweak plugin changes
...
* Avoid dumping complete usage information for unrecognized tweaks
* Alphabetize tweaks in Readme.rst
2015-03-04 18:32:10 -05:00
499ac05ad3
Merge pull request #569 from Fukken-Saved/master
...
Small update (autohauler)
2015-03-04 15:08:52 -05:00
7a26e633e9
Update autohauler.cpp
2015-03-04 07:06:24 -05:00
36cee730f1
Update autohauler.cpp
2015-03-04 06:59:29 -05:00
0b912f54be
Fix field name in lua/stockflow.lua
...
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
6bfbb93377
Merge pull request #557 from jlogsdon/manipulator-job-view
...
Add current job as a view mode in manipulator
2015-03-01 17:14:29 -05:00
1ebb1f1d11
Add current job as a view mode in manipulator
2015-02-28 17:09:58 -05:00
87867b96b9
Add autohauler to plugins/CMakeLists.txt
2015-02-27 23:18:26 -05:00
fdfebf4d4e
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-02-27 23:15:49 -05:00
cdf211d437
Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop
2015-02-27 23:13:06 -05:00
64123d8fea
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2015-02-27 23:09:56 -05:00
ac5909ad2a
Update autohauler.cpp
...
Some small text changes
2015-02-25 07:47:15 -05:00
a228977976
Update autohauler.cpp
...
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
53c88bab56
Update autohauler.cpp
2015-02-25 07:22:25 -05:00
68d088eeb5
Revert "Add autohauler plugin to cmakelist"
...
This reverts commit a13c9b0310
2015-02-25 07:13:29 -05:00
6e0c7d6a4e
Revert "whoops"
...
This reverts commit 5f498b1b78
2015-02-25 07:13:09 -05:00
2549f116a0
Custom Profession Templates in manipulator!
2015-02-24 15:51:24 -05:00
c2c8ae6a44
Add current job as a view mode in manipulator
2015-02-24 15:51:24 -05:00
1d8b2d8cea
Expose manipulator columns to Lua
2015-02-24 15:50:27 -05:00
70824ade14
Allow shift to extend selection
2015-02-24 15:50:27 -05:00
e2d7a7395e
Add several additional format options
...
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
c36daa4d7d
Fix a few minor StringFormatter issues
...
* Recognize the end of a format specifier properly
* Make '$' actually work
2015-02-24 15:50:27 -05:00
5a92080cc1
Add various ID formatting options, allow editing a single dwarf
2015-02-24 15:50:27 -05:00
b5797daa8a
Allow custom nicknames/profession names to use format specifiers
...
Also prevent selecting/applying operations to uneditable units
2015-02-24 15:50:27 -05:00
21e96ba369
Implement batch operation callbacks and a basic string formatter
2015-02-24 15:50:26 -05:00
dd17f90dcd
Add a flag to allow mouse clicks to select ListColumn items
2015-02-24 15:50:26 -05:00
9d600f00a0
Add batch operations menu
2015-02-24 15:50:26 -05:00
990ab9c76b
Typecast nullptr in ListColumn::getFirstSelectedElem()
2015-02-24 15:50:26 -05:00
481e5cc19e
Implement dwarf selection
2015-02-24 15:50:25 -05:00
17fda7ffa0
Fixed whitespace.
2015-02-24 20:28:49 +02:00
e9ab892369
Building hacks changes.
...
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
cebfa603e0
Update isoworld, stonesense
2015-02-22 16:51:37 -05:00
5f498b1b78
whoops
2015-02-22 14:45:15 -05:00
a13c9b0310
Add autohauler plugin to cmakelist
2015-02-22 14:43:08 -05:00
250bc0a58d
Autohauler - An alternative to Autolabor
2015-02-22 14:41:45 -05:00
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
c80fbbc397
Remove AS prefixes from add-spatter.cpp
...
The actual cause of this crash was fixed in #558
See #205
2015-02-19 12:05:32 -05:00
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
f287a99a37
Merge pull request #542 from scamtank/fix-armory
...
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
35d357776c
Substitute removed jobtypes with working ones
...
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -05:00
50770f8cdd
Clean up whitespace in zone.cpp
2015-02-06 19:13:34 -05:00
00072dae1d
Fix crash in zone plugin from scrolling when assigning an owner to a cage
...
Fixes #534
2015-02-06 19:12:10 -05:00
67bf26dbbe
Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
...
New tweak to display pet genders on trade request screen
2015-02-03 08:25:12 -05:00
69dfec88cb
Merge remote-tracking branch 'dfhack/develop' into develop
2015-02-03 01:12:34 -05:00
5a93de3f31
New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
...
Closes #515
2015-02-02 10:04:31 -05:00
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
e34178e367
Fix add-spatter crash
...
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
5b3e5b533e
Make zone compile on Windows.
2015-01-31 21:04:12 -05:00
e9b4fc513a
Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
...
Conflicts:
NEWS
plugins/zone.cpp
2015-01-31 21:01:41 -05:00
1d8fd55a4a
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
...
Conflicts:
NEWS
2015-01-31 20:22:17 -05:00
6b2e7cfe3e
Merge pull request #511 from lethosor/stocksettings-create-dir
...
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
ab01e7d102
Eventful no longer requires LUA_HOOK to do reaction events.
2015-01-31 20:10:06 -05:00
f608235b1e
Fix some Lua things
2015-01-29 19:56:50 -05:00
f2eec3198c
Rename findPenPitAtCoord
2015-01-29 15:02:54 -05:00
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
4199728ba6
Cleanup building methods before extracting to Buildings.h
2015-01-29 13:57:50 -05:00
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
789cc01e93
Remove gcc warnings
2015-01-28 21:28:32 -05:00
10ec5f1330
Use auto to reduce vector iteration redundancy
2015-01-28 21:17:37 -05:00
5f9fe871b3
Add isGelded() to the priority butcher checks
...
Fixes #484
2015-01-28 21:17:37 -05:00
26ad797c43
isGelded function
2015-01-28 21:17:37 -05:00
58f896d569
Create `stocksettings` directory on startup
2015-01-26 16:28:57 -05:00
ae2e4f99eb
Merge branch 'develop' of https://github.com/DFHack/dfhack
2015-01-19 20:02:19 +05:30
8efac385cc
changed tile direction to a string, rather than a hard to understand int.
2015-01-19 19:58:09 +05:30
53a8032f8a
Fix compile of blueprint plugin on Linux.
2015-01-16 03:27:14 -05:00
06c4755168
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
...
Conflicts:
NEWS
Readme.html
2015-01-15 22:45:57 -05:00
da2224b0ba
Changed how parameters are parsed.
2015-01-14 14:58:15 -05:00
106612f386
Use alternate qf syntax for output.
2015-01-14 14:08:54 -05:00
d0273b8eff
Now puts room designations in the query blueprint
2015-01-13 16:15:54 -05:00
f315ee43a4
Added stockpiles
2015-01-13 14:28:28 -05:00
3489c2f39a
Buildings complete
2015-01-13 09:40:24 -05:00
3e91d34ab3
remotefortressreader.cpp only sends map changes now.
2015-01-11 16:16:53 +05:30
ea313b6bf5
plugins/blueprint.cpp: Buildings hopefully
2015-01-09 16:00:47 -05:00
aa332e18e2
Remove stray whitespace
2015-01-08 16:59:37 -05:00
859fdd60d6
annoucnement -> announcement
2015-01-08 16:59:25 -05:00
b627240943
Dig mode complete
2015-01-08 12:17:18 -05:00
819327348b
Blueprint plugin basic structure
...
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
c39cf1fb49
Add room assignment search
2015-01-05 21:09:30 -05:00
448404a465
Fix buildingplan stuff on Windows.
2015-01-05 20:02:54 -05:00
1519d8e9ea
Disable fortplan and buildingplan for now because it doesn't compile on Windows.
2015-01-05 19:34:01 -05:00
cd64fb84b7
Make fortplan use Filesystem::getcwd()
2015-01-05 17:37:41 -05:00
f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
67f0aa774c
Merge remote-tracking branch 'lethosor/tweaks-2'
...
Conflicts:
NEWS
2015-01-05 16:54:24 -05:00
e9fd8cf231
Merge remote-tracking branch 'lethosor/embark-tools-mouse'
...
Also update NEWS
2015-01-05 16:53:06 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
1d0b4deef6
Merge remote-tracking branch 'eswald/trackstop'
...
Conflicts:
NEWS
2015-01-05 16:22:18 -05:00
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
6e36b224d1
Merge remote-tracking branch 'ramblurr/stockpiles'
...
Also update stockpiles plugin to use REQUIRE_GLOBAL()
Conflicts:
plugins/stockpiles.cpp
2015-01-05 16:16:29 -05:00
ca0860c3bd
Merge remote-tracking branch 'lethosor/plugin-globals'
2015-01-05 16:05:40 -05:00
929f63ee2e
Fix error in WatchedRace::SortUnitsByAge
2015-01-05 15:57:34 -05:00
c069a87b47
Update isGay(df::unit) with better determination
2015-01-05 14:59:32 -05:00
1cdf61908e
Collapse ProcessUnits_* methods.
2015-01-05 14:25:44 -05:00
084bbc3162
Add isGay(df::unit*) method
2015-01-05 13:54:17 -05:00
5626bb8da7
layer and vein materials were being set wrong.
2015-01-04 19:05:48 +05:30
47d6e111c8
New tweak: "max-wheelbarrow"
2015-01-01 14:36:49 -05:00
ffac2f1795
New tweak: "eggs-fertile"
2015-01-01 13:48:11 -05:00
cade0d9723
Add local area mouse controls to embark-tools
2015-01-01 11:06:50 -05:00
c373e57c02
Added world names.
2014-12-31 17:50:43 +05:30
efc42c253e
Fix remaining issues with mousequery
2014-12-27 11:03:06 -05:00
088f3715cb
Finish up the bare-bones fortplan plugin with support for furniture that is made from an item of the same name
2014-12-23 17:09:35 -05:00
5547722414
Initial work on fortplan plugin, including separating out code that needs to be shared with buildingplan
2014-12-23 16:56:15 -05:00
ee958c0f8f
Update some plugins/scripts for 0.40.22
...
* autolabor, manipulator: Add BUILD_CONSTRUCTION and BUILD_ROAD labors
* mousequery: Support "toggle engravings" sidebar mode
* devel/export-dt-ini.lua: Add body_part_flags
Conflicts:
plugins/mousequery.cpp
2014-12-21 16:49:33 -05:00
bc58b0a822
Added map location to info.
2014-12-17 19:42:40 +05:30
0b7f890d87
Trackstop bugfix: No longer prevents cancelling building removal.
...
Thanks to Ramblurr for pointing this out.
2014-12-16 21:10:18 -07:00
cc5a78f848
Added function to get the map size, and fixed a stupid material bug.
2014-12-17 08:40:29 +05:30
5fc8a1f51f
digFlood CLEAR error.
2014-12-15 13:41:22 -05:00
f3826abc0c
cleaning up in needs_porting
...
Removed obsolete plugins. Started hotkeys port. Mostly-finished
position port. Corrected dwarfmonitor date display. Documented
putontable.lua in readme.
2014-12-15 23:11:23 +11:00
6982de88bd
Added very basic viewport size and position sending.
2014-12-12 21:04:23 +05:30
d11df5b87f
Added a simple unit listing to remotefortressreader.cpp. Updated stonesense.
2014-12-11 20:10:49 +05:30
22edb5a033
Merge branch 'master' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
plugins/isoworld
plugins/rendermax/CMakeLists.txt
plugins/rendermax/renderer_light.cpp
plugins/rendermax/renderer_light.hpp
plugins/rendermax/renderer_opengl.hpp
plugins/rendermax/rendermax.cpp
plugins/rendermax/rendermax.lua
2014-12-11 17:53:19 +05:30
09681cf029
Update skeleton plugin
2014-12-06 20:55:57 -05:00
88b51fcb5b
Allow strangemood to work if debug_nomoods is not available
2014-12-06 20:29:08 -05:00
a615723b38
Update remaining plugins to use REQUIRE_GLOBAL
2014-12-06 19:30:05 -05:00
5de3e6110a
Merge remote-tracking branch 'origin/develop' into plugin-globals
2014-12-06 17:32:44 -05:00
b9a2ecb440
stockpiles: properly initialize quality arrays
...
Props to @fricy for identifying this bug.
2014-12-05 17:39:29 +01:00
b0e0bbda9b
stockpiles: show proper cased names in filter list
2014-12-05 16:53:19 +01:00
52f4cb3fc1
stockpiles: load prompt uses typing + filtering
2014-12-05 14:49:40 +01:00
332566f6a1
stockpiles: disable gui/script when plugin is disabled
2014-12-05 13:27:58 +01:00
0f06eb7f6f
stockpiles: quiet debug
2014-12-05 12:42:59 +01:00
346f397bca
stockpiles: fix loading crash
2014-12-05 12:35:24 +01:00
7e6066daf2
stockpiles: user friendly error handling
...
* display errors in the GUI when necessary
* handle older versions of DFHack without the persist module
2014-12-05 12:35:24 +01:00
2f4678eee5
stockpiles: more error handling & cleanup
...
* prevent crashes when the path doesn't exist
* remove duplicated functions
* sort file list case insensitively
2014-12-05 12:35:24 +01:00
1525823948
Create stocksettings directory on startup if necessary
2014-12-05 12:35:24 +01:00
b6118d272c
stockpiles: integrate gui plugin into dfhack.init-example
2014-12-05 12:35:24 +01:00
1cde8cffa4
stockpiles: implement GUI controls
2014-12-05 12:35:19 +01:00
2e43ea8b38
stockpiles: refactor code into separate files
...
The file was approaching 3000 lines and contained multiple classes,
making it a real PITA to navigate through. upcoming features would only
add more LOC, so splitting was necessary.
2014-12-05 11:02:40 +01:00
19e977528c
Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
...
Conflicts:
NEWS
2014-12-04 23:49:13 -05:00
c83ed531bc
Merge remote-tracking branches 'lethosor/stocks-esc', 'lethosor/patch-8', 'lethosor/0.40.19-update-labors' and 'lethosor/fixTexts' into develop
2014-12-04 23:34:48 -05:00
cac2245438
Update some plugins to use REQUIRE_GLOBAL
2014-12-03 23:26:54 -05:00
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
e206c242c6
Add a plugin_globals vector to aid in safety checks for plugins that require globals
...
This allows "using df::global::foo" to be replaced by "REQUIRE_GLOBAL(foo)",
and DFHack will refuse to load the plugin if df::global::foo is NULL
2014-12-02 21:32:04 -05:00
2d7ea52c40
Clarify autolabor initialization failure
2014-12-02 17:58:30 -05:00
e3c13fc555
Add gelding to autolabor and manipulator
2014-12-02 17:30:16 -05:00
7859da7d77
Update stonesense.
2014-11-30 12:31:29 -05:00
921f0dd06a
Merge remote-tracking branch 'quietust/develop' into develop
2014-11-30 11:31:59 -05:00
9dbe639919
Merge pull request #402 from Ramblurr/stockpiles
...
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
a6ae6d4c28
autolabor: Fix compile on Windows.
...
VC10 wants an explicit return type for lambdas.
2014-11-28 00:55:26 +01:00
794e1ee6f0
autolabor: Document and improve the talent pool parameter.
2014-11-27 21:13:20 +01:00
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
8b1b32a499
autolabor: Add a talent pool parameter.
2014-11-27 15:56:14 +01:00
d352d0f42d
stockpiles: remove dependency on full protobuf
2014-11-27 14:23:54 +01:00
de919050b1
Revert "install the full protobuf library"
...
This reverts commit 443a9676e1
2014-11-27 13:40:11 +01:00
7cbb1ed043
Revert "use full protobuf library project wide"
...
This reverts commit f100d30f56
2014-11-27 13:39:30 +01:00
b6f5bcb7dc
stockpiles: fix compilation on windows
...
VS2010 only supports a subset of C++11
2014-11-27 13:28:17 +01:00
445640f80c
Allow commands invoked through command-prompt to access selected items/units/buildings
...
Fixes #273
2014-11-25 20:25:31 -05:00
84d24ca13f
Fix Hold->HoldTerrain, also use a proper fix for Attack
2014-11-25 11:30:25 -06:00
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
063b669f6b
stockpiles: cleanup output and add docs
2014-11-22 18:57:56 +01:00
00c1676744
stockpiles: correct typo
2014-11-22 18:54:22 +01:00
e599f4b1e1
stockpiles: more user documentation
2014-11-22 18:33:49 +01:00
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
869a92dfc5
stockpiles: handle all metals and stones
2014-11-22 18:33:49 +01:00
0e8832f05d
stockpiles: overwrite existing files
2014-11-22 18:33:49 +01:00
f1ce575be3
stockpiles: animals list still shown even when disabled
2014-11-22 18:33:49 +01:00
4f2851199e
stockpiles: handle animal cages and prepared meals
2014-11-22 18:33:49 +01:00
e525b47815
stockpiles: make gem other mats more robust
2014-11-22 18:33:49 +01:00
eb3a71c739
stockpiles: fix finished goods quality
2014-11-22 18:33:48 +01:00
12b27e09bb
stockpiles: handle furniture sand_bags field
2014-11-22 18:33:48 +01:00
98a1278128
stockpiles: fix quality unserialization
2014-11-22 18:33:48 +01:00
cc1e4d16a2
stockpiles: allow loading without file extension
2014-11-22 18:33:48 +01:00
e66732f731
stockpiles: add missing protobuf field
2014-11-22 18:33:48 +01:00
79c65e0fcf
stockpiles: fix male/female creature mat lookups
2014-11-22 18:33:48 +01:00
44af084e8e
stockpiles: import from disk and write to memory
2014-11-22 18:33:48 +01:00
543a88d03d
stockpiles: pass correct filename
2014-11-22 18:33:48 +01:00
c251aeabe3
stockpiles: add optional debug output
2014-11-22 18:33:48 +01:00
86ba81a3a9
stockpiles: format with ANSI style and 4 spaces
2014-11-22 18:33:48 +01:00
a4d19070e8
stockpiles: write some documentation
2014-11-22 18:33:48 +01:00
f7ed821ef9
stockpiles: serialization complete
...
* working file import/export
2014-11-22 18:33:48 +01:00
224a19295d
stockpiles: serialize through weapons+trap components
...
* generalize itemdefs
2014-11-22 18:33:48 +01:00
25f6c440d8
stockpiles: serialize through cloth
2014-11-22 18:33:47 +01:00
d74ac1b3a6
stockpiles: serialize through leather
...
* more code reuse!
2014-11-22 18:33:47 +01:00
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
dc5f0fed1a
stockpiles: serialize ammo and coins
2014-11-22 18:33:47 +01:00
d167b3f385
stockpiles: basic serialization for animals - stone
2014-11-22 18:33:47 +01:00
443a9676e1
install the full protobuf library
...
required to access text_format (needed by stockpiles plugin)
2014-11-22 18:33:47 +01:00
ebb1345332
stockpiles: add settings protobuf message format
2014-11-22 18:33:47 +01:00
4922c36ada
Prevent farm-plot-select from selecting crops when no crops are listed
...
Fixes #396
2014-11-18 19:57:29 -05:00
889bd06ffc
ruby: fix windows platform detection
2014-11-16 13:00:38 +01:00
9fd6e9f03c
Expand dwarfmonitor weather indicator
2014-11-15 17:29:19 -05:00
bc73319333
Make rain indicator LIGHTBLUE for better visibility
2014-11-15 16:39:19 -05:00
9b0d0eba45
Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins
2014-11-15 16:36:35 -05:00
4513fa4ab2
Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins
2014-11-15 16:34:59 -05:00
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
f7fcb342ed
Fix buildingplan compiling with GCC
2014-11-15 16:21:47 -05:00
578ac08999
Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins
2014-11-15 16:18:00 -05:00
3c1e07252b
Update autotrade stockpile controls
2014-11-15 16:16:32 -05:00
d62305b69e
Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins
...
Conflicts:
plugins/autotrade.cpp
2014-11-15 15:56:44 -05:00
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
8042c5d342
ruby: load arch-specific ruby-autogen
2014-11-14 12:49:08 +01:00
696380e749
ruby: distinguish ruby-autogen.rb name based on architecture
2014-11-14 12:47:42 +01:00
e2229f6a6a
ruby: remove DL_RUBY cmake option
2014-11-14 12:38:24 +01:00
be1d411b83
Add missing <functional> include for std::greater
2014-11-09 11:19:51 +01:00
1b0a2ecb8a
Merge remote-tracking branch 'eswald/tradescreen' into develop
...
Conflicts:
NEWS
2014-11-09 00:42:50 -05:00
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
267d0837ad
Merge pull request #381 from lethosor/update-cmakelists
...
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
7929d44030
Merge pull request #382 from PeridexisErrant/autolabor-fixes
...
Autolabor fixes
2014-11-09 00:33:46 -05:00
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
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
2484f89542
Update dwarfmonitor's happiness display
2014-11-08 15:08:56 -05:00
04ceb64bad
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
...
Conflicts:
NEWS
2014-11-08 14:36:20 -05:00
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
ec580cdfa5
Re-enable rendermax in CMakeLists.txt
2014-11-07 16:43:50 -05:00
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
46ebeaa722
Adding Shift-Up to the fast-trade tweak.
2014-11-06 22:22:02 -07:00
7fb82131c7
Switching fast-trade from Shift-Enter to Shift-Down
...
Technically, from SELECT_ALL to CURSOR_DOWN_FAST, to avoid blocking the new native Select All functionality.
As a bonus, the new key repeats as you hold it down.
2014-11-06 22:14:00 -07:00
777b2f6416
Moving trade screen search options to match the new column size
2014-11-06 22:05:05 -07:00
db7bc8c5c8
Removing autotrade's version reporting.
...
It's built with DFHack itself now, so the global version is more accurate than the plugin-specific version, which hasn't been consistently getting incremented.
2014-11-06 21:53:00 -07:00
2ebc318daa
Removing autotrade's obsolete Mark All
2014-11-06 21:47:14 -07:00
e9e8b83656
Update stonesense.
2014-11-05 20:57:57 -05:00
b81346fa21
Merge pull request #349 from lethosor/tweak-reorganization
...
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
5232bffb53
farm-plot-select: Actually check for crop validity
2014-11-02 12:21:51 -05:00
29d6bba669
Fix trackstop ambiguity complaints, update df-structures.
2014-11-02 11:55:01 -05:00
14b947837c
Merge remote-tracking branch 'origin/develop' into tweak-reorganization
...
Conflicts:
NEWS
Readme.html
plugins/tweak/tweak.cpp
2014-11-02 11:40:53 -05:00
87443035a9
Merge remote-tracking branch 'quietust/develop' into develop
...
Conflicts:
plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
4ccfb07a54
Merge pull request #350 from hobotron-df/fastdwarf-attack-speed
...
Fixes for fastdwarf combat speed and attack retargeting.
2014-11-02 03:37:55 -05:00
bfac2b97cc
Merge pull request #352 from eswald/trackstop
...
New trackstop plugin
2014-11-02 03:34:22 -05:00
82fb533176
Merge pull request #353 from eswald/autotrade-bugfix
...
Autotrade bugfix: Mark All now unmarks bin contents.
2014-11-02 03:33:28 -05:00
6c356b5ae9
Merge pull request #359 from lethosor/embark-tools-oo-pr
...
embark-tools cleanup
2014-11-02 03:30:38 -05:00
0fa2cab5ac
Merge pull request #360 from eswald/automelt
...
Faster automelt
2014-11-02 03:29:01 -05:00
0fd15cc1e4
Merge pull request #365 from eswald/stable-sorting
...
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
49939ccb9c
Merge pull request #369 from warmist/fix-rendermax
...
Update rendermax
2014-11-02 03:25:04 -05:00
bad923130c
Manipulator - remove minimum width for Labors column, since it triggered the "should never happen" case upon extending the first column from 4 to 6
2014-11-01 11:24:05 -05:00
7c92f4abaa
Seems I misread the code from 0.34.11 - it switches against rand(2), not rand(3)
2014-10-31 13:47:04 -05:00
f08a32f4e2
Update Manipulator to display stress level instead of happiness
2014-10-31 13:33:35 -05:00
ed225de365
Update strangemood to check stress level for fell/macabre moods
2014-10-31 13:33:18 -05:00
f683395cae
Comment out more of military-training tweak, which no longer compiles
2014-10-31 13:33:04 -05:00
d05f249619
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-10-31 13:32:49 -05:00
72654e602a
Merge pull request #355 from lethosor/patch-6
...
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
04ec2c9932
Update version to v0.40.14 and hack things so they compile.
...
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
ac73c0eeba
Allowing non-labor skills to sort stably.
2014-10-21 22:49:50 -06:00
169da1342d
Switching Dwarf Manipulator to a stable sort.
...
This means, for example, that when you sort by one skill, then by a second, dwarves with the first skill but not the second will still be grouped together.
2014-10-21 22:43:56 -06:00
f3626c1004
embark-tools cleanup
...
Fix #358 : Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
0fd3f3dbf4
Update digFlood documentation to mention onLoad(World).init
...
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
95dd009a15
Restoring automelt for items in bins.
...
The stockpile iterator yields bins, but not their contents. Should other containers be checked, too?
2014-10-05 17:57:57 -06:00
aafa3a5f91
Expanding on the rollers menu.
...
As requested by fricy.
2014-10-02 22:00:40 -06:00
d2fb51f99e
New tweak: nestbox-color
2014-10-01 20:14:41 -04:00
2e80c6053c
Autotrade bugfix: Mark All now unmarks bin contents.
...
This prevents a form of cheating, because they already get traded with the bin itself, so their value had been counted twice.
However, the search plugin still enables this kind of cheating...
2014-09-29 21:37:05 -06:00
4af9b7a054
Checking for more required variables.
...
Trying to use trackstop without ui or world results in a hard crash.
2014-09-28 21:34:42 -06:00
0fad63bba7
New trackstop plugin.
...
Simply adds a menu to track stops, showing and changing friction and dump direction.
2014-09-28 18:24:07 -06:00
425d81ea2d
New tweak: civ-view-agreement
2014-09-28 13:13:53 -04:00
da72848b0b
Fixes for fastdwarf combat speed and attack retargeting.
2014-09-27 19:47:27 -05:00
d34b22b2c2
New tweak: farm-plot-select
2014-09-27 19:56:31 -04:00
999d265d50
New tweak: import-priority-category
2014-09-27 18:14:25 -04:00
aeb9ea54ec
'tweak' plugin cleanup/reorganization
...
* Removed confirm-embark, stable-temp, patrol-duty
* Split (enabled) tweaks into separate files
* New tweak: manager-quantity
2014-09-27 17:01:32 -04:00
e46a27c8a4
Switching automelt to the stockpile iterator.
2014-09-27 11:07:26 -06:00
eed684a8df
fix superdwarf
2014-09-26 11:39:05 +02:00
0766538ecd
ruby: add df.print_color(col, string)
2014-09-25 15:53:03 +02:00
1a38c72763
ruby: add stl-fstream to codegen
2014-09-25 13:19:00 +02:00
beb5216640
Fix selection behavior of mousequery on lowest z-level
2014-09-24 17:48:49 -04:00
c894346639
ruby: call RUBY_INIT_STACK
2014-09-19 21:38:22 +02:00
d75c01b0ff
merge git://github.com/hobotron-df/dfhack
2014-09-19 21:37:28 +02:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
c927f0fa3c
Merge remote-tracking branch 'lethosor/patch-5'
2014-09-16 17:25:28 -04:00
fde49176fe
Merge remote-tracking branch 'lethosor/update-search-keys'
2014-09-16 17:23:45 -04:00
040acd166b
Merge remote-tracking branch 'eswald/automelt'
...
Conflicts:
dfhack.init-example
2014-09-16 17:20:50 -04:00
a225984bc5
Merge remote-tracking branch 'eswald/hotkeys'
2014-09-16 17:11:15 -04:00
5a1d88307f
Merge remote-tracking branch 'eswald/stockpile-iterator'
2014-09-16 17:05:02 -04:00
1ea1b50790
job_material_category -> dfhack_material_category
...
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
991fb3cea2
Change search key from 's' to 'q' on unit/job lists
...
Avoids a conflict with the "suspend job" option (added in 0.40.12)
2014-09-10 16:59:09 -04:00
e76b8c4b6b
Merging automelt hotkey into autotrade line when links intrude.
...
The new interface looks significantly different, but only when there are too many stockpile links to show the lines in their usual places.
The difference between bright green and grey should be obvious most of the time, right?
2014-09-09 21:08:38 -06:00
8bc2f02aee
Moving the automelt hotkey next to autotrade.
2014-09-09 20:51:58 -06:00
757491f112
Add automelt plugin
2014-09-09 20:31:55 -06:00
07de1ce3f6
Add hotkeys plugin
2014-09-08 22:42:04 -06:00
4800794ba6
Merge remote-tracking branch 'dfhack/develop'
2014-09-08 13:23:28 -04:00
f5039b37b8
Merge remote-tracking branch 'lethosor/osx-plug-dylib'
...
Conflicts:
NEWS
2014-09-08 13:14:28 -04:00
5152e1f13e
Merge pull request #316 from eswald/trade-search
...
Removing new trade hotkeys while a counteroffer is displayed.
2014-09-08 13:12:31 -04:00
52d0f1c3f6
Merge remote-tracking branch 'lethosor/autotrade-usage-newline'
2014-09-08 13:00:11 -04:00
0f311a7606
Removing dead duplicate code.
2014-09-07 15:11:11 -06:00
83b1317173
Switching stockflow to the internal getStockpileContents.
...
This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
2014-09-07 15:07:57 -06:00
1ce07c063d
Canonical way to find the stockpile by id.
2014-09-07 14:55:34 -06:00
3c58bd3948
Switching autotrade to use StockpileIterator.
...
This should speed it up a bit, and prevents it from marking a stream of empty bins.
2014-09-07 14:03:51 -06:00
a45438d172
Fix 3dveins crashing because of trees and malformed biome data.
...
The sky in the latest versions has uninitialized biome data, which
made the plugin crash on invalid vector index access. Also, trees
on ground may still have wrong geolayer inside them like obsidian.
2014-09-05 15:11:13 +04:00
7143479253
Moving trade screen search dimming to the proper row.
...
Unfortunately, this now means it hits one of the search clear lines when both are active.
2014-09-04 23:28:59 -06:00
aaa8a829d1
Removing new trade hotkeys while a counteroffer is displayed.
...
Fixes http://www.bay12forums.com/smf/index.php?topic=126076.1140
It's tempting to use has_offer for this effect, but that flag remains true after hitting Enter to consider the offer.
Relies on a structure update: https://github.com/DFHack/df-structures/pull/18
2014-09-04 21:08:46 -06:00
cf06dc3503
Update to 0.40.11, fix a few devel plugins to build again
2014-09-04 08:26:45 -05:00
92946e5fbc
Minor reveal fix - only preallocate unreveal data for existing map blocks
2014-08-31 11:43:19 -05:00
9aee476c6e
Make plugins use ".plug.dylib" extension on OS X
2014-08-30 09:21:19 -04:00
76ecc9b347
Add newline to autotrade usage
...
Fixes #304
2014-08-30 08:47:37 -04:00
e115a392f7
Added binary tarballs for ruby dependencies to work around cmake download failures against github ( http://cloud.github.com/downloads/jjyg/dfhack/ )
2014-08-29 19:52:23 -05:00
948fbb48f6
Updated stonesense
2014-08-29 18:45:25 +05:30
b98b6f61d2
Merge branch 'remote_reader' of github.com:JapaMala/dfhack into develop
2014-08-29 18:39:57 +05:30
96a0bd0de0
Added growth locations to the fake growth materials
2014-08-29 17:08:21 +05:30
79b572ba65
Update stonesense.
2014-08-29 05:26:07 -04:00
5c0588dd34
Merge pull request #299 from eswald/stockflow-40
...
Stockflow Repairs
2014-08-28 14:56:04 -05:00
f0c52a9a73
Merge pull request #289 from eswald/trade-search
...
Moving trade screen search lines
2014-08-28 14:54:00 -05:00
5ccd7dbb8f
Merge pull request #296 from lethosor/embark-tools-render
...
embark-tools fix
2014-08-28 14:53:22 -05:00
8bfc0e93ec
Merge pull request #298 from eswald/stockpile-lines
...
Stockpile lines
2014-08-28 14:53:09 -05:00
6d9d616fff
Prioritizing search hooks on the trade screen.
...
The autotrade plugin has been intercepting the m/u/M/U keys if enabled after enabling the search plugin. An explicit priority makes the search plugin always accept those keys while typing in a search line.
2014-08-25 21:18:52 -06:00
17a23796c8
Fix embark-tools render() behavior
2014-08-25 13:08:11 -04:00
632b0b85bd
Speeding up the stockpile item count.
...
kr0pper reports two orders of magnitude speed improvement for check_pile() by using the map tile item cache.
2014-08-23 17:49:03 -06:00
8495bddc2d
Removing an obsolete workaround
2014-08-23 17:46:35 -06:00
eb221e1165
Fix some blatant bugs in somebody else's additions to showmood
2014-08-21 15:23:05 -05:00
33f4f9fdcb
Update cleanmap to optionally also clean up item spatters such as leaves
2014-08-20 10:54:00 -05:00
ae80ca9ec9
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-08-20 10:32:59 -05:00
6f77372367
No longer overwrites stockpile links
...
The new lines added to the stockpile 'q' menu are usually drawn at the bottom, where the last few Give/Take links are written. Now, they notice when they would overwrite one of those links, and move somewhere else. The 'Done' line can now be overwritten by stockflow, but that hint isn't necessary for experienced players.
2014-08-19 14:19:13 -06:00
c95ad05a7e
Switching new stockpile menu keys from green to red.
2014-08-17 16:01:42 -06:00
71098b6108
Moving the stocks stockpile hotkey to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:45:30 -06:00
034e34f8b6
Moving the autotrade hotkey to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:54 -06:00
9f17966f87
Moving stockflow hotkeys to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:02 -06:00
2b59f0edca
Switching Mark/Unmark all hotkeys to red
...
Following the policy described in the Readme.
2014-08-17 12:38:13 -06:00
6060da5903
Moving Mark/Unmark all in the trade screen
...
These are in a different plugin, but affect the same interface.
2014-08-17 12:27:57 -06:00
6ee29bfa11
Moving trade screen search lines
...
Now that this screen uses the window's full height, the hard-coded line is no longer appropriate.
2014-08-17 10:59:33 -06:00
59e6607d8c
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2014-08-16 10:26:24 -04:00
f04b93210a
Bug fixing.
...
Fixes for "tab" in hacked buildings.
2014-08-16 16:58:09 +03:00
6868cab1fe
Exposed dfhack.jobs.linkIntoWorld. Simplified eventful and gui.dwarfmode for sidebar use/creation.
2014-08-16 16:58:01 +03:00
f5d50adf0d
Removing the leaves check for stockpile acceptability.
...
That item type no longer exists in DF 0.40; such items will now always be considered properly stored by any stockpile they're on.
2014-08-15 21:41:23 -06:00
287301b682
Update autolabor to work with 0.40
2014-08-15 14:12:57 -05:00
13bffed647
Update isoworld to a commit that actually exists
2014-08-15 09:44:52 -05:00
493dd47383
Updated df-structures and isoworld
2014-08-15 19:28:03 +05:30
5add8c433d
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
...
Conflicts:
plugins/remotefortressreader.cpp
2014-08-15 19:15:00 +05:30
ebda2d8472
Fix ageItem to work correctly, and update XML
2014-08-15 08:13:15 -05:00
ce4d1db5a0
More removing unneeded fixes.
2014-08-15 04:23:54 -04:00
820839fa8d
Remove stuff that doesn't exist anymore from dfhack.init-example and documentation.
2014-08-15 03:03:25 -04:00
b2dc4bd104
autolabor doesn't load properly in windows.
2014-08-15 02:19:24 -04:00
c1ed62ad64
Merge branch 'develop' of git://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/stockflow.cpp
2014-08-14 22:49:37 -05:00
28d89db1fd
Merge pull request #275 from eswald/stockflow-40
...
Stockflow Improvements
2014-08-14 16:33:46 -05:00
cfefc23e6a
Add new labors to Manipulator
2014-08-11 15:21:24 -05:00
8a9e3d1a72
Plugin cleanup - always do "using df::global::[foo]". Also, get rid of old 0.34.11 binpatches
2014-08-11 15:07:52 -05:00
2471c4a68e
Add a new API for converting between interface_key and string characters.
...
It's necessary now that the simple linear arrangement is broken.
2014-08-11 14:23:19 +04:00
002bd5240b
Bump version to v0.40.07 and update find-offsets to new pressure plate UI.
2014-08-11 14:14:42 +04:00
0f99ea0ccb
ruby: fix spawn_liquid for 40.06
2014-08-11 01:11:46 +02:00
9d460d506e
Probably a fix to rendermax for 0.40.xx
2014-08-09 22:14:55 +03:00
36435ca8cf
Merge branch 'develop' of https://github.com/quietust/dfhack into remote_reader
...
Conflicts:
library/modules/Items.cpp
library/modules/MapCache.cpp
library/modules/Maps.cpp
library/modules/Materials.cpp
library/modules/Translation.cpp
plugins/CMakeLists.txt
2014-08-08 20:54:44 +05:30
756485c4db
Added support for getting a list of plant growths with fake material names.
2014-08-08 20:35:57 +05:30
55ebca4a7a
Plant immolate/extirpate no longer work, but create/grow are still good
2014-08-06 10:03:34 -05:00
9956b4a5ef
Update getplants, plants, and prospector, and isolate autochop
2014-08-06 09:31:42 -05:00
0463021823
Merge branch '0.40-plugin-updates' of github.com:lethosor/dfhack into develop
2014-08-06 08:27:29 -05:00
f34d68e567
Actual correct fix here
2014-08-05 20:28:09 -05:00
86c036b7d3
Add an extra check that was missing
2014-08-05 20:19:31 -05:00
1bcfcd36f6
Avoid buffer overrun on mouse clicks
2014-08-05 19:59:53 -05:00
fa26aa79ea
Make some plugins compile for 0.40
...
dwarfmonitor: remove StoreItemInChest, StoreItemInCabinet, ProcessPlantsBag, and BrewDrink
dig/diggingInvaders/siege-engine: update special cases for trees to handle roots/branches/trunks
2014-08-04 12:28:22 -04:00
19133ff327
Documenting the new Stockflow option.
2014-08-03 16:40:03 -06:00
1aba6a6739
Faster stockflow mode, ignoring the bookkeeper.
2014-08-03 15:14:20 -06:00
2ebebaf62f
Deleting old stockflow records.
...
Once a stockpile has been removed or abandoned, its persistent configuration is obsolete.
2014-08-03 15:07:04 -06:00
1b1475fb94
Warning about mismatched stockflow entries.
...
For the most part, mismatches should only happen if the reaction list has changed between world loads, which means either the raw files or the plugin files have been changed. For now, such entries are ignored, though in some cases it might be possible to recover a new order number by searching through the reaction list.
2014-08-03 15:04:28 -06:00
2db1c9d722
Moving the global job_types cache into the two functions that use it.
...
It's mostly an artifact of a misunderstanding, anyway.
2014-08-03 14:57:20 -06:00
1aafa206bc
Localizing a few Lua variables.
...
It seems like the globals could be localized, too, but I'm not quite sure what that would accomplish.
2014-08-02 18:08:13 -06:00
ad4d545036
Ignoring the removed job types for DF 0.40+
...
The version check allows the plugin to work with DF 0.34, just in case.
2014-08-02 17:58:36 -06:00
2928f15629
Update fastdwarf to work properly in 0.40
2014-08-01 08:45:23 -05:00
1450298484
assumed_identity -> identity
2014-07-29 16:30:22 -05:00
88dfb1faef
criminal_case -> crime
2014-07-29 16:27:16 -05:00
d6162cd189
death_info -> incident
2014-07-29 16:26:14 -05:00
bc5e0f6ad6
Made DFHack buildable. Also added plant proto definitions
2014-07-23 19:57:47 +05:30
e711605413
Some minor corrections
2014-07-21 13:26:34 -05:00
97de21357c
First pass for 0.40 compatibility; still lots left to do, but this will at least build
2014-07-21 13:18:29 -05:00
b598cbb0dd
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-07-20 16:43:00 +05:30
216019e5af
Disconnected the RemoteReader values from the DF enums.
2014-07-17 17:46:00 +05:30
48e714b65b
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
2014-07-15 17:50:11 +05:30
2d5ec9e45d
remotefortressreader can send over more info over the sockets.
2014-07-15 17:48:12 +05:30
0a16bc2e12
Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
...
Conflicts:
plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
6652074644
Delete the syndromeTrigger plugin.
2014-07-03 09:03:26 -04:00
81c87d0921
EventManager: INTERACTION event for unit interactions.
2014-07-03 04:55:12 -04:00
829ad945ea
Added a function to do a hash check on the entire fortress. It's not overly useful yet, other than benching.
2014-07-03 08:35:45 +05:30
e04ab11659
Merge branch 'develop' of github.com:DFHack/dfhack into develop
...
Conflicts:
library/xml
plugins/stonesense
2014-07-02 23:18:55 +05:30
d765de4546
Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization
2014-07-01 02:05:14 -04:00
fe875f7c02
Cleaned up eventful.lua.eventType.
2014-06-30 03:16:45 -04:00
c7636ae442
Deleted devel/printArgs because there's a script for that.
2014-06-30 02:56:07 -04:00
2894b406ac
Sorted devel CMakeList.
2014-06-30 02:54:15 -04:00
deb755fd57
Sorted the plugins CMakeList.
2014-06-30 02:51:23 -04:00
0aa2dc149f
Converted outsideOnly plugin to Lua script.
2014-06-30 02:21:58 -04:00
961d033ade
EventManager: unload event for convenience.
2014-06-29 10:03:55 -04:00
f88c176dd3
Removed autoSyndrome.
2014-06-29 06:16:52 -04:00
5e2653998c
Added rendermax to supported
...
It's stable enough and quite nice. Also one person missed it in release.
2014-06-28 16:18:04 +04:00
8e7e87ac73
Added UNIT_ATTACK event to EventManager and exposed it to Lua.
2014-06-28 02:31:34 -04:00
fc7ac9b47f
Update XML and sync plugin
2014-06-27 13:01:46 -05:00
92c4514286
Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop
2014-06-26 17:22:56 +04:00
4f9479cce5
Fixed a bug where remotefortressreader was using min_x for min_z.
2014-06-25 18:49:00 +05:30
3c8ba091f2
Disable "stable position" when site finder is active
2014-06-24 10:08:50 -04:00
9625d56384
Update Manipulator to respect entity permitted_labor settings
...
This has the effect of locking out the Alchemy labor, which is how it's
supposed to work in-game (but doesn't due to bug #6511 )
2014-06-24 08:36:36 -05:00
7313c18a2a
EventManager/eventful: added ON_REPORT event and exposed it to Lua.
2014-06-23 09:15:46 -04:00
9afc861a2a
syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly.
2014-06-23 09:14:56 -04:00
247bd212f3
Update stonesense.
2014-06-21 13:28:59 -04:00
3f717af0b7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
library/xml
2014-06-21 16:43:44 +05:30
f94fc5846d
outsideOnly: allow checking periodically in case a building was made outside and then became inside.
2014-06-20 19:48:56 -04:00
c0e6e62cea
outsideOnly: registration of buildings is now required, and you can also register buildings as inside-only.
2014-06-20 18:49:11 -04:00
12d18ca64d
Fix compile issues on windows.
2014-06-19 22:32:02 -04:00
3357718d03
Merge remote-tracking branch 'origin/develop' into 0.34.11-r5
...
Conflicts:
Readme.rst
plugins/CMakeLists.txt
2014-06-19 19:59:20 -04:00
cca605d8b4
Prevent blank lines from being stored in history
2014-06-17 17:21:30 -04:00
0c144b821d
Reimplement command-prompt history
...
Also add shift-left/right for back/forward one word
2014-06-17 17:11:45 -04:00
1684eced8a
Remove (broken) command history
...
This reverts commit cc07a373f3
2014-06-17 12:45:57 -04:00
6f74d60521
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:33:04 -04:00
b8e7c8a946
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:28:46 -04:00
ce849312c7
remotefortressreader now can send over sets of MapBlocks
2014-06-17 21:47:16 +05:30
2db73a407d
Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop
2014-06-17 10:39:26 +04:00
86131781da
Merge branch 'dev-embarktools-pr' of git://github.com/lethosor/dfhack into develop
2014-06-16 14:03:28 +04:00
f9f865cb90
Fix a compile error and signed/unsigned mismatch warnings.
2014-06-16 14:02:48 +04:00
db2d59ac77
Started work on a generic visualizer socket client plugin. Currently only sends over inorganic and creature materials, nothing else.
2014-06-15 10:10:12 +05:30
befab343a1
Add ability to auto allocate rooms to noble positions.
2014-06-15 16:19:15 +12:00
a751df4219
Allow to toggle between Profession and Squad view instead of wasting screen space with a new column
2014-06-10 22:59:28 -04:00
5999dc63da
Use setupdwarfgame field names
2014-06-10 17:30:02 -04:00
f534c91fb8
Fix screen handling
2014-06-10 12:48:46 -04:00
69c9353196
Merge branch 'develop' into tweak-confirm-embark
2014-06-10 12:43:03 -04:00
b11673e9b0
Use this instead of getCurViewscreen
2014-06-10 12:38:40 -04:00
088eff05e5
Merge branch 'develop' into dev-embarktools-pr
2014-06-10 12:08:43 -04:00
044f958551
Squad column and squad info in Dwarf Manipulator (manipulator plugin)
2014-06-09 21:58:16 -04:00
cc07a373f3
Command-prompt history
...
Creates duplicate entries occasionally
Also disabled movies
2014-06-09 19:38:21 -04:00
aafcd6c43a
Fix 4/6 behavior
2014-06-09 17:00:26 -04:00
055afafedc
command-prompt: Basic line editing
...
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -04:00
b1f73b791c
DwarfMonitor: Show current date and weather in border.
2014-06-07 15:12:19 +12:00
a1f9b1d1c4
Sync with structures change
2014-06-06 14:24:57 -05:00
c29d61dca2
Use INTERPOSE_NEXT in key_conflict
...
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
0a1d87c09f
confirm-embark: Make esc work again
2014-06-04 23:18:19 -04:00
f29d1886ff
tweak confirm-embark fixes
...
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
5f611ec48b
Add automelt plugin
2014-06-04 22:18:40 +12:00
9ddbd49e28
Add stockpile autodump functionality
2014-06-04 22:01:17 +12:00
6ec0fd6589
New tweak: confirm-embark
...
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
a7fd6c4783
Add embark-tools settings interface
2014-06-03 15:03:03 -04:00
23acf276b4
Silence warning C4800 on Windows
2014-06-03 08:58:31 -05:00
7de0b2dd39
Merge pull request #255 from quietust/develop
...
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
df244aa7a4
Disable mouse query when linking levers.
...
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
4034df3560
Fix incorrect plugin name in version check
2014-06-03 12:59:55 +04:00
63254df6dd
Fix obvious issues in stockflow.
...
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
e7292379f7
Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop
2014-06-03 12:13:56 +04:00
4831fb8a8c
Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop
2014-06-03 12:11:31 +04:00
89269f76fd
Merge remote-tracking branch 'warmist/cmd-prompt' into develop
2014-06-03 12:10:06 +04:00
f07f2e1079
Fix autotrade plugin name in version string
2014-06-02 16:05:05 +12:00
99659e7e00
cmd-prompt needs to work on ANY screen. This fixes it.
2014-05-26 18:42:42 +03:00
e483e7439f
Fix problems with NONE for item types and subtypes
2014-05-22 08:18:01 -05:00
2d778be956
Fix embark sidebar updating
2014-05-20 15:51:26 -04:00
fcb62ac7dd
sticky: Fix handling of rapid input
2014-05-19 17:43:30 -04:00
da31bab419
Display embark label on all 5 map pages
2014-05-19 16:33:17 -04:00
bb5f7b475d
Add sticky (equivalent of tweak stable-cursor)
2014-05-19 16:11:42 -04:00
02811c773c
Fix crash with child screens (e.g. saving a macro)
2014-05-19 15:53:29 -04:00
96b70a93bc
Update readme
2014-05-18 21:21:17 -04:00
6519ac1bf8
Add sand indicator and allow enabling/disabling all tools
2014-05-18 20:03:59 -04:00
0f5802af9f
Add embark-tools
...
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04:00
d1aee89491
remove space before hyphen
2014-05-18 13:01:07 -05:00
76ec3ba58c
Fix English names containing the word "the"
...
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
8cc4bea0d4
Added petcapRemover plugin.
2014-05-17 17:59:41 -04:00
f852802270
Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins
2014-05-16 21:23:34 -04:00
293a535aa4
Fix crash with mouse input in search plugin
2014-05-16 20:53:36 -04:00
9b1d393c1c
Append newline to each section of output
2014-05-15 17:30:42 -04:00
2074f7e78b
Fix handling of newline characters in command-prompt output
2014-05-15 15:51:03 -04:00
d52a07ef76
Dismiss previous command prompt before creating a new one
2014-05-14 18:56:30 -04:00
a516811bb1
Only allow 3dveins to be run in fortress mode
...
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
dbe903b5b7
Re-enable melting in stocks plugin.
2014-05-13 22:15:37 +12:00
56903b9374
Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop
2014-05-12 21:44:31 +04:00
b166f51568
Handle missing arguments to filter/paint in tiletypes
2014-05-11 14:17:56 -04:00
e829b2eea4
Fix missing newline and update Readme.html
2014-05-11 16:05:00 +04:00
ae8d630cfa
Merge remote-tracking branch 'warmist/dev-rendermax' into develop
2014-05-11 15:44:29 +04:00
a088219b3e
Fixed ALL the bugs: zooming does not crash and fullscreening also does not crash now.
2014-05-11 14:19:02 +03:00
a3d7b54b9c
Merge remote-tracking branch 'falconne/develop' into develop
2014-05-11 13:22:13 +04:00
8989c06900
Merge branch 'tweak_changes' into develop
2014-05-11 13:19:44 +04:00
43064f41e3
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-05-11 09:34:05 +05:30
4b8f68dfa9
Add a few tweaks - fix wear on cloth/leather items, disable wear on adamantine clothes
2014-05-08 14:22:45 -05:00
b6b839c802
Fix for osx to build.
2014-05-06 21:59:11 +03:00
fef296110f
Fixed friend class bug.
2014-05-06 07:17:02 +03:00
f824e7f294
stocks plugin: added more filtering and display options.
2014-05-05 16:56:40 +12:00
144eff4cf2
Clearing the center column.
...
The official order selection screen has an extra space to the left of the orders on the right-hand side.
2014-05-04 15:36:42 -06:00
4fc850445d
Magic Number Reduction: Display placement constants
2014-05-04 15:28:53 -06:00
767badbfb9
Magic number reduction: Clothing flags
...
Bone and shell are used to construct BARRED and SCALED armor/clothing items, for some reason.
2014-05-04 15:13:25 -06:00
bdb22235af
Magic number reduction: Job types
2014-05-04 15:02:12 -06:00
2d5f7e4022
Magic number reduction: Persistent storage
...
Replaces explicit indices into the ints field of Stockflow persistent storage objects with enumerated values.
2014-05-04 12:55:00 -06:00
723cfcf28e
Attempting to repair an order object leak.
...
Now frees manager_order objects in the reaction_list when the plugin is disabled or the world unloaded. However, there may still be orders leaked elsewhere.
2014-05-04 12:35:10 -06:00
e29e29d537
Updated readme, NEWS and changed where rendermax looks for it's config.
2014-05-04 21:00:16 +03:00
13584f08c5
Merge remote-tracking branch 'warmist/dev-buildings' into develop
2014-05-04 19:52:01 +04:00
1f93b8e144
getplants: add autochop function to automate woodcutting.
2014-05-04 23:43:52 +12:00
e9c7d502e2
dwarfmonitor: add screen to summarise preferences of fortress dwarfs.
2014-05-04 22:45:48 +12:00
5a3065fa80
Use shifted keys for buildingplan so as not to interfere with QuickFort.
2014-05-04 22:23:10 +12:00
cba143c447
Add workshop profile search.
2014-05-04 22:04:03 +12:00
7fd7d3d48c
mousequery: several usability improvements.
...
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
de9140336f
autotrade: adds "(Un)mark All" options to both panes of trade screen.
2014-05-03 22:56:34 +12:00
5e52bb60f0
Update uicommon.h with new common display functions
2014-05-03 21:19:46 +12:00
a14f31fbfe
Show box select dimensions in Automaterial
2014-05-03 11:44:35 +12:00
415cdad489
Make using new for allocating DF objects with vtables a compile-time error.
...
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.
This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
e4641c506f
Replace a std::string method not implemented until C++11 with a C++0x-valid substitute
2014-04-21 09:34:42 +04:00
5fb87c2ea9
Now accepts the new enable/disable commands.
2014-04-18 21:58:45 -06:00
63d256c1e9
Adjust siege engine targeting weights.
...
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
c27c38e4c0
Remove tired or hungry siege operators from duty when at peace.
...
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
fc9826389b
Account for meandering movement when predicting unit path in siege engine.
...
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
55cea36c76
Use the new API to produce combat reports for aimed siege engine attacks.
...
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
0a99bb0cae
Now works when enabled is true by default.
2014-04-13 15:23:37 -06:00
b9ed7a5cc2
Stockflow plugin v1.0
2014-04-13 15:19:03 -06:00
7aecffe0cd
Update structures and fix broken things.
2014-04-04 22:34:39 +04:00
eac126c884
ruby: use placement-new instead of hack
2014-04-01 15:12:52 +02:00
837da8ae98
Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types
2014-03-25 13:30:45 -05:00
36b069e981
Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop
2014-03-24 20:10:58 +04:00
a01939fce6
Sync structures.
2014-03-24 19:45:27 +04:00
827dd121d8
Make createitem default to the controlled unit in adventure mode.
2014-03-24 19:35:34 +04:00
8963a49414
Forbid the items shot by siege engines if the forbid ammo order is set.
...
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
4cbab2b014
Small fix that got lost in rebase
2014-03-07 20:28:07 +02:00
50963c73fa
rendermax: added adv mode lights also more proc-expensive diffuse mode.
2014-03-07 20:08:48 +02:00
b5b01ea02b
rendermax: mainly organizing
...
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
372f861010
rendermax: fixed crashes (hopefully for real this time)
2014-03-07 20:08:10 +02:00
72259c8eba
Added creature lights and item lights.
2014-03-07 20:08:08 +02:00
830d9900fb
Fixed a bug that enabled rendermax even when it was supposed to be off.
2014-03-07 20:08:08 +02:00
a3d3c34671
Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode)
2014-03-07 20:08:07 +02:00
c2db761a1b
Rendermax: made it use unordered_map instead of map.
2014-03-07 20:07:21 +02:00
5ad3a7570f
Fixed a lot of disable lights bugs
2014-03-07 20:07:21 +02:00
f34a4ce34e
Renamed lightCell to rgbf
2014-03-07 20:07:20 +02:00
ee1bad84fc
Threading rewrite.
2014-03-07 20:07:20 +02:00
b248eb3e52
Fixed broken buildings, also added floodgate functionality.
...
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
0cf5eedc2a
Fixed potential error with building getting transparent on un-powering.
2014-03-07 20:07:17 +02:00
48f855c499
Added occlusionON|occlusionOFF commands
2014-03-07 20:06:50 +02:00
360b5d2e18
Fix for gems not getting right color.
2014-03-07 20:06:50 +02:00
28985167c9
Fixed bug with buildings and added gems to material definition.
2014-03-07 20:06:49 +02:00
b12fd5a4c5
Changed sun calculation direction.
2014-03-07 20:06:46 +02:00
d8b0b82122
Added antialiased lights. They kind of suck. So I disabled them.
2014-03-07 20:06:46 +02:00
b4091b5056
Added day colors and day speed parameters.
2014-03-07 20:06:45 +02:00
70880897f6
Added sun time manipulation, updated helpstring.
2014-03-07 20:06:45 +02:00
7c0a734c97
Added building size. Removed material flags (on by default)
2014-03-07 20:06:18 +02:00
70e1320e6f
removed something I had for testing.
2014-03-07 20:06:18 +02:00
740e3ebc51
Implemented building support.
2014-03-07 20:06:16 +02:00
3433eb15fb
fixed (?) ice and made dragon blood glow a little.
2014-03-07 20:06:16 +02:00
5b0cb86278
Made the lighting engine multithreaded.
2014-03-07 20:06:15 +02:00
354ec37046
MAXIMUM SPEED UPDATE!!!!!
2014-03-07 20:06:12 +02:00
048395a2cd
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2014-03-07 20:06:12 +02:00
13228855eb
added square light volume, and automatic light radius.
2014-03-07 20:05:52 +02:00
b015149ac1
Added cmake info for the config lua.
2014-03-07 20:05:51 +02:00
0551661db2
Added more advanced sun light calculation
2014-03-07 20:05:51 +02:00
dceec6c6c7
Plantfix, viewport height fix, and fov viewport fix.
2014-03-07 20:05:47 +02:00
4ccc95bc97
Major rewrite of opacity calculation.
2014-03-07 20:05:47 +02:00
74bed5529b
Made light plugin read configuration file (rendermax.lua)
2014-03-07 20:04:02 +02:00
20d4707b00
rendermax: lights off when sleeping
2014-03-07 20:03:59 +02:00
de8a76e37f
rendermax: sunlight travels down stairs
2014-03-07 20:03:59 +02:00
4d7a7425d0
Prelimenary work on advmode
2014-03-07 20:03:56 +02:00
4abff416d9
Some performance fixes and tweaks. Opaque blocks can now emit light.
2014-03-07 20:03:56 +02:00
9a8ee755f8
rendermax: basic daylight
2014-03-07 20:03:52 +02:00
2058a822a3
rendermax: make citizen glow
2014-03-07 20:03:17 +02:00
0a413e179e
Made the low water check actually use floats.
2014-03-07 20:03:17 +02:00
31de296f31
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2014-03-07 20:03:16 +02:00
f173810e2a
Fixed skylight
2014-03-07 20:03:14 +02:00
2195c4fe28
Small fixes
2014-03-07 20:03:12 +02:00
f745de3aff
Added transparency to ice walls
2014-03-07 20:03:10 +02:00
83265efaa8
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2014-03-07 20:03:06 +02:00
ee7902c529
Fixed unload/disable crash. Added glowing plants.
2014-03-07 20:02:08 +02:00
471eb9c02d
Torches for statues, candles on the tables.
2014-03-07 20:01:19 +02:00
1c4b5c2d38
Update water a bit.
2014-03-07 20:01:18 +02:00
b3ba3b9107
Fixed non-circular light. Do not show hidden tiles.
2014-03-07 20:01:10 +02:00
f92e4c91b8
Performance improvements, added flickering cursor light.
2014-03-07 20:00:39 +02:00
14c494dbfe
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2014-03-07 19:58:32 +02:00
2fef60708d
Added some more operators to the cell color class.
2014-03-07 19:58:32 +02:00
04f2d4ea58
Made windows transmit colored light.
2014-03-07 19:58:31 +02:00
a19200fbfe
C++ version of light engine.
2014-03-07 19:58:30 +02:00
446b4b9d50
New line algo for lights
2014-03-07 19:58:28 +02:00
eb999cd0ad
Another file forgotten
2014-03-07 19:58:27 +02:00
843237d1c9
Fixed bug.
2014-03-07 19:58:27 +02:00
39da5babee
Implemented lua interface.
2014-03-07 19:58:25 +02:00
584640f12c
Added help for truecolor light testing thing. Also added colors.
2014-03-07 19:58:24 +02:00
f68852b721
Forgot to add the plugin itself. Also some improvements
2014-03-07 19:58:24 +02:00
55d845992c
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2014-03-07 19:58:23 +02:00
dec0b202ee
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2014-03-07 19:58:22 +02:00
a52451a97a
eventful: added support for custom workshops and a convenience function to interpose side panel generation
2014-03-07 19:41:50 +02:00
834350012f
building-hacks: added lua convenience function, made impassible tile fix optional.
2014-03-07 19:41:50 +02:00
b1e7356e63
Added animation and on update callback.
2014-03-07 19:41:49 +02:00
94b5961372
New plugin: building-hacks. Allows workshops to block liquids and consume mechanical power, connect to machines.
2014-03-07 19:41:49 +02:00
cec4c8cd30
Added an output stream, now response is visible in same window. Also added a way to start prompt pre-filled.
...
It's nice to bind it to e.g. ctrl-shift-o "command-prompt :lua"
2014-03-07 18:52:06 +02:00
97ae857c38
Always shatter glass items within bins thrown by a catapult.
...
The glass materials have impact strength copied from compression
strength, so the items had 1/5 chance to survive without damage.
Since glass is infinite, it makes sense to make it single-use.
2014-03-07 17:42:49 +04:00
df22f25a69
Rewrite aiming error code to account for distance and engine quality.
...
Now the error is simulated by using an approximate normal distribution.
2014-03-07 17:35:04 +04:00
ef93f2ea4c
Compute quality of siege engines and use it to extend firing range.
...
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
9827184ef7
Switch to the new random number generator class.
2014-03-07 17:34:21 +04:00
983685de8d
Squash uninitialized variable warnings.
2014-03-07 17:34:21 +04:00
41bcd52c36
Make siege engine debug markings toggleable via lua.
...
Also check that the tile actually exists to avoid crashes.
2014-03-07 17:34:04 +04:00
9576c47e18
Cmake fix
2014-03-04 19:00:12 +02:00
904808b168
Command prompt plugin with docs and readme patch.
2014-03-04 18:51:23 +02:00
dd268d43d9
Merge branch 'master' of https://github.com/jjyg/dfhack
2014-02-27 15:49:18 -06:00
5a158b21cf
Update plugins to match fixed field names in cage/civzone
2014-02-27 14:51:45 -06:00
6d0e6cf7d5
remove old unused code from when dfhack was out of process
2014-02-26 12:44:10 +01:00
5ced804312
Merge branch 'master' of https://github.com/angavrilov/dfhack
2014-02-20 12:42:57 -06:00
73a112e06c
Update tubefill to skip hollow tubes by default, and update docs
2014-02-14 11:06:33 -06:00
67b7681ba6
Fix reaction errors, make quantities more consistent
2014-02-13 11:37:04 -06:00
387cc983f9
Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack
2014-02-02 23:50:21 +01:00
c0d3e9189d
showmood: fix item count for real
2014-01-27 12:40:21 +01:00
7f411e1cbf
Merge branch 'plant'
2014-01-27 10:45:30 +01:00
56f935aea6
Add bugfix for #6420
2014-01-26 18:55:52 -06:00
5c28d7eaf6
Not enough mood tickets given out
2014-01-25 09:15:43 -06:00
f0eeba93ce
DFHack compiles under OS X now.
2014-01-25 03:21:56 -05:00
7f14e109fa
Use DF-compatible RNG for better randomness
2014-01-19 20:31:15 -06:00
89b3c7bb67
Change syntax for specifying mood type, also allow overriding mood skill
2014-01-19 20:21:41 -06:00
baf377afba
Meant to move this, not copy it
2014-01-18 22:56:56 -06:00
24fbf570e6
Add "strangemood" plugin, lets you trigger a strange mood
2014-01-18 22:45:42 -06:00
04f88ef8fb
showmood: fix count of gotten items
2014-01-05 02:29:01 +01:00
7adb6b2ee9
ruby: codegen unit.caste_tg helper
2014-01-04 15:04:56 +01:00
91a7280ac3
Need to include tool_uses.h
2014-01-03 16:42:24 -06:00
69fc2bec6d
A bit of cleanup
2013-12-27 13:01:34 -06:00
540bcc1f46
Enhance createitem, can now place items into containers or buildings
2013-12-27 12:53:33 -06:00
8917892473
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/xml
plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
5c51f7dd2a
Merge branch 'master' of git://github.com/angavrilov/dfhack
2013-11-10 14:04:48 -06:00
7ce5831257
Get rid of the std exception.
2013-11-07 11:58:11 +04:00
4d2e5b80bf
Use df::allocate here for proper compatibility with 40d and earlier
2013-11-04 14:55:31 -06:00
883d89bb68
plants: move all commands as "plant" subcommands, update NEWS/Readme
2013-11-02 18:54:29 +01:00
463bb8d498
Update plugins to use CR_WRONG_USAGE where appropriate
2013-10-30 15:58:14 -05:00
ff939e36bb
Missed parameter in plugin command init
2013-10-30 14:25:35 -05:00
b97a13fa63
Update "plants" plugin
...
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
8ccb04236f
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
2013-10-25 11:47:03 -04:00
54b45349c5
Improve pre-embark prospect using new knowledge about soil depth.
2013-10-25 14:37:37 +04:00
e4978a1da7
Relax 3dveins preconditions to account for soil quirks and volcanoes.
2013-10-25 12:51:06 +04:00
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
c409289ee4
EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
...
- fixed unregister to allow unregistering individual TICK events
- make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
a0ee74b3a5
eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code
2013-10-20 19:56:48 -04:00
e81c060627
Added EVENT_MAX just in case someone wants it.
2013-10-20 15:24:31 -04:00
d4542b32fa
eventful: removed extra EventManager::unregisterAll.
2013-10-20 15:24:04 -04:00
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
d179812c22
Small bug fix for autolabor crashing on script created creatures.
2013-10-20 21:50:22 +03:00
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
39553cfb6d
EventManager: fixed a problem with constructionHandler.
2013-10-20 14:14:02 -04:00
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
b2d2a074c8
Validate vein types in the scan phase and leave unexpected ones alone.
2013-10-20 12:33:17 +04:00
6805656dd0
Added enable/disable functionality to diggingInvaders.
2013-10-19 21:42:24 -04:00
9d3ee11349
Merge branch 'diggingInvaders' into 0.34.11-r4
...
Conflicts:
scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
0bf427c689
Added enable/disable functionality to new plugins.
2013-10-19 21:19:39 -04:00
ef9d3b1521
Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4
2013-10-19 20:28:30 -04:00
57fc0f3e89
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
library/xml
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
1bd6d5f96d
ruby: add FEATURE/ice map tile materials
2013-10-14 01:58:55 +02:00
3d7661e7e9
ruby: fix map tile material reading
2013-10-14 00:01:26 +02:00
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
5bcae49249
Implement generation of 3D veins that match the existing mineral counts.
...
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
86d0022c58
Implement reading and writing the map for 3D veins plugin.
...
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
6852adbd91
Expose new MapCache features in probe and tiletypes.
2013-10-10 12:15:50 +04:00
4ba4f90147
ruby: add support for enable/disable plugin
2013-10-07 13:58:28 +02:00
a18347608a
ruby: vectors default to int32_t
2013-10-07 13:33:21 +02:00
32a6073dad
Remove lambdas from dwarfmonitor and resume.
2013-10-03 16:30:06 +04:00
f3be0ee187
Remove the use of lambdas in buildingplan.
2013-10-02 19:55:48 +04:00
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
a487ede2b9
autodump: typo in errmsg
2013-09-23 21:28:27 +02:00
b885123d4e
Fix a crash in beehive code if bees die with yet uncollected products.
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
896cd11fe9
Track readable names of vmethod hooks for diagnostic messages.
...
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
70a2ab9141
Fix crash due to incorrect loop bounds in add-spatter.
...
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
308e7b6820
fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste
2013-08-10 01:57:11 +02:00
279c4a48dc
Started work on ramp generation, still needs work.
2013-07-22 19:05:09 +05:30
0bd627a6f6
Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same.
2013-07-21 10:28:46 +05:30
297fa86c34
follow df-structures change to drawBuilding
2013-07-07 17:40:28 +02:00
34e5716cc0
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-28 23:52:51 +03:00
647b14b471
Fixed potential error with building getting transparent on un-powering.
2013-06-28 23:51:52 +03:00
269a2680c8
Added occlusionON|occlusionOFF commands
2013-06-28 23:34:47 +03:00
102b2ed450
Fixed broken buildings, also added floodgate functionality.
2013-06-28 23:47:54 +05:30
368a326b40
Fix for gems not getting right color.
2013-06-28 17:22:24 +03:00
26d557fc68
Fixed bug with buildings and added gems to material definition.
2013-06-27 18:11:50 +03:00
e2db468d3d
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-27 16:18:46 +03:00
7c190cd3f0
Added antialiased lights. They kind of suck. So I disabled them.
2013-06-27 16:11:29 +03:00
67859ada0a
Changed sun calculation direction.
2013-06-27 02:49:18 +05:30
7c9f0fd781
Added day colors and day speed parameters.
2013-06-27 00:14:03 +03:00
e1daa16d9e
Added sun time manipulation, updated helpstring.
2013-06-26 22:05:22 +03:00
b7f28877a2
Added building size. Removed material flags (on by default)
2013-06-26 20:19:30 +03:00
d90a7bfb88
removed something I had for testing.
2013-06-26 19:26:11 +05:30
dc42fa2fa3
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-26 19:14:55 +05:30
689caa5039
Made the lighting engine multithreaded.
2013-06-26 19:12:14 +05:30
c1fef35b52
Renamed digSmart to digFlood.
2013-06-25 19:57:17 -04:00
fbbae3e900
Implemented building support.
2013-06-26 01:18:26 +03:00
1d2accbe94
fixed (?) ice and made dragon blood glow a little.
2013-06-25 22:49:52 +03:00
539abff49a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
f4923d6974
added square light volume, and automatic light radius.
2013-06-25 23:13:55 +05:30
588ca8b8dd
MAXIMUM SPEED UPDATE!!!!!
2013-06-25 20:36:53 +03:00
3957fac531
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2013-06-25 19:34:38 +03:00
57e68aaee9
Added cmake info for the config lua.
2013-06-25 16:44:44 +05:30
5265f107b0
Added more advanced sun light calculation
2013-06-25 16:33:01 +05:30
ef7abaee14
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-25 01:25:56 +03:00
87f151f441
Plantfix, viewport height fix, and fov viewport fix.
2013-06-25 01:25:38 +03:00
4d9b7bd23d
Major rewrite of opacity calculation.
2013-06-25 00:59:32 +03:00
cb767531cf
Made light plugin read configuration file (rendermax.lua)
2013-06-24 18:18:57 +03:00
8271725320
Some performance fixes and tweaks. Opaque blocks can now emit light.
2013-06-24 14:20:22 +05:30
8dcff9bc5d
Merge branch 'rendermax' of git://github.com/jjyg/dfhack
2013-06-24 10:34:03 +03:00
5a82270aa6
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-24 10:19:10 +03:00
abc9dc300e
Prelimenary work on advmode
2013-06-24 03:47:42 +03:00
19952b9139
rendermax: lights off when sleeping
2013-06-24 02:27:43 +02:00
b95683adb2
rendermax: sunlight travels down stairs
2013-06-24 02:22:30 +02:00
ec913c2c5e
Merge branch 'rendermax' of https://github.com/jjyg/dfhack
2013-06-24 05:37:59 +05:30
b8d2ceb23b
Made the low water check actually use floats.
2013-06-24 05:35:16 +05:30
1a5169c70c
Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax
2013-06-24 01:56:32 +02:00
fb5d248720
rendermax: basic daylight
2013-06-24 01:54:09 +02:00
2da136116d
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2013-06-24 05:10:01 +05:30
50073ae406
rendermax: make citizen glow
2013-06-24 00:45:45 +02:00
30697ee115
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-24 03:58:23 +05:30
a2cef2d86a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
736f9e85fc
Fixed skylight
2013-06-24 01:26:25 +03:00
8c9de79812
Small fixes
2013-06-24 00:53:39 +03:00
f5f1328678
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
fe41504952
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
3d6f4d3478
Added transparency to ice walls
2013-06-24 00:36:43 +03:00
6cd926b67e
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2013-06-24 00:10:52 +03:00
c675ca467a
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2013-06-24 02:35:03 +05:30
06915aeded
Fixed unload/disable crash. Added glowing plants.
2013-06-23 23:56:01 +03:00
82deeafe89
Torches for statues, candles on the tables.
2013-06-23 22:28:26 +03:00
0473f89fa2
Update water a bit.
2013-06-23 21:49:17 +03:00
84ed3797d4
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-23 21:46:58 +03:00
fd0c053a80
Added some more operators to the cell color class.
2013-06-24 00:14:06 +05:30
1361b38f27
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-23 21:35:13 +03:00
4f7df238ea
Fixed non-circular light. Do not show hidden tiles.
2013-06-23 21:29:03 +03:00
f415ea2100
Made windows transmit colored light.
2013-06-23 23:51:25 +05:30
cb6130066d
Performance improvements, added flickering cursor light.
2013-06-23 20:45:05 +03:00
140371a0c7
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 22:05:02 +05:30
2c49c9e83c
C++ version of light engine.
2013-06-23 19:25:42 +03:00
25ab75137b
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 15:27:04 +05:30
e3ee876a11
New line algo for lights
2013-06-23 12:20:35 +03:00
be953ba4ab
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 12:07:14 +05:30
76f4c51a29
Another file forgotten
2013-06-23 09:36:04 +03:00
bea2cd74d6
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 11:50:09 +05:30
b35ea4d10c
Fixed bug.
2013-06-23 09:19:29 +03:00
77a301db27
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 02:45:14 +05:30
4cc14641ac
Implemented lua interface.
2013-06-22 17:40:52 +03:00
906864feaa
Added help for truecolor light testing thing. Also added colors.
2013-06-22 14:14:35 +03:00
c273377284
Forgot to add the plugin itself. Also some improvements
2013-06-22 13:29:58 +03:00
ea6a264fe2
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2013-06-22 03:45:42 +03:00
ebc51f1bd3
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2013-06-21 22:47:23 +03:00
dc78f16e2b
Added a simple unity project that connects to DF and pulls a list of plugins.
2013-06-17 23:53:36 +05:30
f459bfc4f1
diggingInvaders: added per-creature dig times and differentiated between smooth and rough constructions.
2013-06-15 23:04:15 -04:00
8c6881beb6
Cleanup
2013-06-14 14:46:10 -05:00
4193d9b5b3
Add new plugin for cleaning up construction building materials
2013-06-14 14:40:02 -05:00
776d088eb9
diggingInvaders: tweaks.
2013-06-11 07:25:07 -04:00
f557376c3a
diggingInvaders: make invaders dig slowly, in a configurable way.
2013-06-11 05:14:56 -04:00
0378bbb896
diggingInvaders: proper user interface.
2013-06-10 01:58:27 -04:00
07a4839d8b
diggingInvaders: made it easy to flip between int64 and int32 for distance cost. It did not make a significant difference in performance when I timed it.
2013-06-09 23:26:07 -04:00
4e715ca44b
diggingInvaders: made it only do a little work each frame instead of all at once with the pathfinding.
2013-06-09 23:07:51 -04:00
c4533dcb0c
diggingInvaders: only path from one guy, and other minor tweaks.
2013-06-09 17:52:13 -04:00
d26b11eb40
diggingInvaders: cleaned up pick creation.
2013-06-09 17:20:23 -04:00
638affee06
diggingInvaders: tweaked pick creation. Don't recreate if they already have one.
2013-06-09 16:23:41 -04:00
08114cf574
diggingInvaders: more fixes. Still a few issues with ramps probably.
2013-05-31 20:39:43 -04:00
2b7dfca21e
diggingInvaders: cleanup, tweaks. Works for simple situations.
2013-05-31 19:27:22 -04:00
f8261348ff
Merge branch 'master' into diggingInvaders
...
Also make edgeCost.cpp compile because I stopped midsentence for some reason.
Conflicts:
library/modules/Maps.cpp
2013-05-31 16:28:05 -04:00
909d686ae4
digSmart: remove print statement.
2013-05-31 13:41:31 -04:00
b82b3f2283
digSmart: added user interface and documentation.
2013-05-31 13:32:56 -04:00
b945b36016
digSmart: framework in place for finding the bug. When a tile is actively being dug, the dig designation is cleared. If you designate the tile again for digging, multiple dwarves might try to dig it at the same time, leading to job cancellation spam when one finishes.
2013-05-31 12:23:28 -04:00
20fa38da7e
digSmart: still doesn't working, but learning more. Something weird happens with dig designations.
2013-05-31 00:49:35 -04:00
4ba73bc171
Merge branch 'master' into digSmart
2013-05-30 22:22:16 -04:00
8982abc163
treefarm: automatically chop trees and dig obsidian
2013-05-30 22:18:08 -04:00
594247b57e
skeletonShort: slightly easier to copy+paste it to start new plugins, but is more illegible to new DFHackers.
2013-05-30 19:07:22 -04:00
ee9bddf831
autoSyndrome comment tweaks
2013-05-25 20:23:59 -04:00
3403146461
Merge remote-tracking branch 'peterix/master'
...
Conflicts:
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
83a9e5c837
autoSyndrome: added reset policies, allowing modders to specify what to do if a unit already has the syndrome in question.
2013-05-25 14:26:42 -04:00
22f31ca3ad
workNow tweaks
2013-05-25 12:23:38 -04:00
5cca0b84a3
fastdwarf: made it work better when both fastdwarf and teledwarf are enabled.
2013-05-25 11:07:59 -04:00
141043363d
autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly.
2013-05-25 10:20:22 -04:00
b44cd86dc9
EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.
2013-05-25 09:44:17 -04:00
01c311cf13
Weird compilation error.
2013-05-24 15:55:40 -04:00
170fe6a0ef
autoSyndrome/syndromeTrigger: made things off by default.
2013-05-24 15:55:19 -04:00
63e1f61f4f
autoSyndrome/syndromeTrigger: deal with overlap better for commands.
2013-05-12 12:43:45 -04:00
c127ad052e
autoSyndrome and syndromeTrigger documentation.
2013-05-11 19:20:02 -04:00
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
dd739313b1
ruby: tweak item_isfree
2013-04-30 18:38:52 +02:00
f3e357d161
Fix detection of GET_MATERIAL_FROM_REAGENT results in workflow.
...
Dereference pointer to strings. Also just return undefined
material instead of skipping the product if it still fails.
2013-04-30 19:42:51 +04:00
18a91ef221
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
plugins/stonesense
2013-04-24 18:00:40 +02:00
c39f4bc182
Fix build bug in automaterial.
2013-04-24 17:49:18 +02:00
222c61ab25
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-24 17:36:22 +02:00
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
df6355a092
Merge https://github.com/jjyg/dfhack
2013-04-24 16:24:14 +02:00
0efbc74ac2
Merge https://github.com/quietust/dfhack
...
Conflicts:
NEWS
2013-04-24 16:21:59 +02:00
aad5296f91
Merge branch 'master' of https://github.com/rampaging-poet/dfhack
2013-04-24 16:14:30 +02:00
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
ce47033190
fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.
2013-04-24 23:37:05 +12:00
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
80de3c05fa
Stocks plugin: Add keywords to search for flags.
2013-04-24 23:31:37 +12:00
eb8b2faf66
Stocks plugin: fix inventory check, add trade assignments, better hotkets.
2013-04-23 22:15:25 +12:00
c9776f481c
ruby: add construction/siegeengine bld subtypes in building_alloc
2013-04-21 22:29:51 +02:00
e70d7b404a
Don't exclude webs, check for items in inventory before discarding those without a valid position.
2013-04-20 12:09:07 +12:00
de5e713c51
ruby: add rb dfhack command shortcut
2013-04-16 21:54:03 +02:00
811bd191d5
Add wear filter
2013-04-15 20:43:13 +12:00
d99b930f58
Better Stocks - Quality & Wear filters
2013-04-14 16:39:21 +12:00
13451bd487
ruby: fix crash on Compound#_cpp_delete
2013-04-14 01:17:44 +02:00
17513283d4
Better Stocks screen - WIP
2013-04-14 00:45:06 +12:00
40f9f06360
dig: ignore tile shape if hidden
2013-04-12 15:23:16 +02:00
b2e22a2c42
ruby: add facility to queue dfhack commands
2013-04-12 15:23:13 +02:00
d0ba4f5881
Better Stocks screen - WIP
2013-04-11 20:52:46 +12:00
399fd107e4
Make createitem create shoes in pairs (as well as gloves)
2013-04-08 08:29:50 -05:00
658e64c1b2
Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense
2013-04-07 20:25:38 +02:00
fc6cb3ae42
Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger'
2013-04-07 14:00:24 -04:00
959321ec22
syndromeTrigger: logic tweak.
2013-04-07 13:56:12 -04:00
1c78f06a1c
syndromeTrigger: only complain once.
2013-04-07 13:22:38 -04:00
b057a0d82a
Merge branch 'once' into syndromeTrigger
2013-04-07 13:19:18 -04:00
ddc4cad73b
autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index.
2013-04-07 13:17:00 -04:00
329538edfd
digsmart temp commit.
2013-04-07 13:08:32 -04:00
3b921feb61
Skip ice and brook floors.
2013-04-06 17:07:46 +05:30
efaa247d2a
Stocks start
2013-04-06 17:40:07 +13:00
660ce50542
Floors are loaded one level below solid blocks.
2013-04-06 02:42:51 +05:30
541e4f0947
Changed liquids to use an enum.
2013-04-04 14:28:43 +05:30
f1410c10c6
digcircle: fix bug #181 (help: radius -> diameter)
2013-04-03 22:16:36 +02:00
575b1c45fc
Sync isoworld, linux fixes
2013-04-03 01:10:06 +02:00
3580409cc1
Sync isoworld, some protobuf building changes
2013-04-02 22:37:41 +02:00
c361ba7bf4
Sync, fix isoworld in .gitmodules
2013-04-02 19:19:29 +02:00
5ff9947a06
Merge branch '0.34.11-r3-bugfixes'
2013-04-02 19:17:32 +02:00
fe922e3528
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-02 19:01:46 +02:00
33f0f0d3f3
Isoworldremote plugin now gives material lists, and verifies weather a map block has anything in it.
2013-04-02 22:03:32 +05:30
9d6f202988
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 22:42:55 +13:00
462a08a4ea
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 12:03:37 +04:00
c0a4db32e9
Fixed the single tile reported coordinates.
2013-04-02 11:57:30 +05:30
b2f4029f42
Added in more sanity checks.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-04-02 02:58:06 +05:30
29a2f36e4a
Fix small bug in the tweak plugin
2013-04-01 17:42:02 +02:00
b0ee4fe9d9
Update stonesense
2013-04-11 21:08:33 +02:00
d7c91975c0
Fix warnings
2013-04-01 20:02:39 +13:00
1070eec016
Make planned doors pet passable
2013-04-01 19:52:34 +13:00
1550df496f
Right align happiness monitor to avoid interference with announcements
2013-04-01 19:52:13 +13:00
c020c0271c
Respect export mandates
2013-04-01 19:21:10 +13:00
86a02952f8
Changed coords to embark tiles instead of blocks.
2013-04-01 04:39:30 +05:30
4bb80d9865
Added some sanity checks to isoworldremote.cpp
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-31 12:31:44 +05:30
39390e2749
Got a working connection with Isoworld.
2013-03-31 02:42:06 +05:30
135289e89a
ruby: add MapTile#burrow
2013-03-30 20:22:25 +01:00
0397912353
Merge branch 'master' into digSmart
...
Conflicts:
plugins/CMakeLists.txt
2013-03-30 12:46:10 -04:00
a3de35c32e
Added isoworld to the build list.
2013-03-30 15:27:37 +05:30
9981d21965
Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote
...
Conflicts:
plugins/CMakeLists.txt
plugins/isoworldremote.cpp
2013-03-30 13:03:22 +05:30
14369d18dc
Initial work on the isoworldremote plugin, which sends sections of the map to isoworld.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-30 12:38:42 +05:30
2027416997
Merge pull request #1 from zkf/overlay-position
...
Right-align happiness monitor overlay.
2013-03-29 20:59:54 -07:00
a5b9848271
Clean up
2013-03-30 16:38:21 +13:00
edc305db69
AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible.
2013-03-30 16:38:03 +13:00
323c56a641
Right-align happiness monitor overlay.
...
The overlay was blocking game messages which are displayed on the left side.
2013-03-29 15:03:09 +01:00
6e9de245c2
Started work on isoworld remote
2013-03-27 01:24:13 +05:30
637daad83d
Outside only: new plugin. Buildings that start with OUTSIDE_ONLY get destroyed instantly before they can be created.
2013-03-24 00:15:20 -04:00
52480b155b
autoSyndrome: made it only print each error message at most once per DF run.
2013-03-23 22:46:43 -04:00
32e321c704
Merge branch 'once' into autoSyndrome
2013-03-23 22:39:57 -04:00
b4092f62e6
New module: Once. Intended to help prevent debug error message spam.
2013-03-23 22:38:33 -04:00
dc9a62fd1d
Fix crash when using right mouse button
2013-03-22 23:08:33 +13:00
cd00213e66
autoSyndrome: fixed a bug where it complains because can't find the worker because it didn't get a copy of the job quickly enough. It can still happen, it just doesn't complain anymore.
2013-03-17 11:02:31 -04:00
cf57fba58e
autoSyndrome: reorganize everything, make it make more sense.
2013-03-17 01:18:12 -04:00
83f7ad1700
syndromeTrigger: renamed from trueTransformation and generalized it to allow for triggering commands on any syndrome infection.
2013-03-17 00:23:08 -04:00
16b64b9fc3
workNow: added option to look for jobs every time a dwarf finishes or cancels a job.
2013-03-16 22:43:57 -04:00
4fe37b4bd5
ruby: fix DfFlagarray.inspect when no indexenum
2013-03-16 21:06:31 +01:00
49024809ce
Update NEWS, build DFusion by default
2013-03-16 18:37:16 +01:00
ffa9c50486
autoSyndrome: stop spam, and disable by default
2013-03-16 13:26:59 +01:00
59ec9bfc57
Update versions
2013-03-16 22:13:01 +13:00
a85d6bd2dd
Merge branch 'mousequery'
2013-03-16 20:40:20 +13:00
4bd5e3db77
Add mousequery to build
2013-03-16 20:35:53 +13:00
c16bd3d71a
Apply r3 name changes
2013-03-16 18:25:02 +13:00
cc5d354a59
Merge branch 'master' of github:jjyg/dfhack
2013-03-16 01:04:29 +01:00
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
f69f245732
Allow planned constructions orthogonal to stairs
2013-03-16 12:26:37 +13:00
5a92eabb6b
Add all fortress dwarves to happiness monitor.
2013-03-16 10:29:17 +13:00
6a31abc60f
Another update to stonesense :-P
2013-03-15 14:30:21 -04:00
d87bfd7f26
Update to Stonesense
2013-03-15 14:28:46 -04:00
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
9a58c5b7b3
Stonesense updates
2013-03-14 13:33:01 -04:00
2b675c80ce
Fix createitem to not leak memory
2013-03-14 12:00:16 -05:00
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
b5806f7278
Copy fixes from r3 to fix search issues in Nobles screen.
2013-03-13 22:21:30 +13:00
215a2e78af
Fix crash when persistent data refers to missing buildings. Can only happen if planned buildings are removed with the plugin removed, then the game is reloaded after the plugin is put back.
2013-03-13 21:44:33 +13:00
bc0c493b7c
Workaround for strange crash in accelerated mod
2013-03-12 21:18:29 +13:00
8e9fc235a9
Adding a debug mode to track down an elusive bug.
2013-03-10 16:14:00 +13:00
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
63707471f4
WIP - More logical categories and variable windows
2013-03-07 22:27:06 +13:00
0b31fbafea
Remove the "assign random labors to random dwarfs" nonsense that I put in while drunk or something.
2013-03-02 23:05:09 -06:00
701b7b7d9b
Multiple data averaging windows and gcc fixes.
2013-03-02 15:14:56 +13:00
b07f2fc33f
Get entity from unit->civ_id instead of from ui (so it works in advmode), and only get site in fortress mode
2013-02-28 10:00:00 -06:00
9bd999ebc1
Update createitem to allow specifying quantity, also allow it to auto-detect whether it needs to create extra gloves and assign handedness
2013-02-28 09:23:48 -06:00
4afe74efa6
Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.
2013-02-28 23:39:22 +13:00
f55030909f
Add createItem plugin, spawns an item at the selected unit's feet
2013-02-27 11:09:06 -06:00
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
2bbe6824fb
fix tweak/stable-cursor for low z-levels
2013-02-21 15:26:35 +01:00
6b70a89321
ruby: typo in autogen/int8_t
2013-02-17 02:05:01 +01:00
db98b06c6e
Added documentation of autolabor exemption from burrowed dwarves
2013-02-15 19:16:26 -08:00
b0528d283b
Merge branch 'master' of git://github.com/peterix/dfhack
2013-02-15 20:23:39 +02:00
ab6a993689
friendship.lua: removed debug printing
2013-02-15 20:21:33 +02:00
bb5d98e895
friendship fixes.
2013-02-15 20:19:55 +02:00
fe70df593b
Sync submodules
2013-02-14 18:36:21 -06:00
ac2e45c843
Compatibility with older GCC versions in the search plugin
2013-02-14 12:45:58 +01:00
8de172f1c8
Binsearch in units.active can't possibly work, ever.
2013-02-14 13:13:25 +04:00
a8f5e54e37
Sync submodules
2013-02-14 09:53:14 +01:00
e35a1c7720
Correct autolabor2 for changes in structures.
2013-02-13 16:00:09 -06:00
8d278a87db
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
...
Conflicts:
plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
f9a3450aca
Reinstate old autolabor in its original place.
2013-02-13 13:34:39 -06:00
ff0012c91f
Move new autolabor to autolabor2 in devel.
2013-02-13 13:33:32 -06:00
27f5dc7631
Autolabor: add in the rest of the building construct and deconstruct labors. Also handle wood crafts at the craftdwarf's shop.
2013-02-13 13:07:54 -06:00
a17760af4f
Communicate the Plugin pointer to the plugin in a decent sort of way.
2013-02-13 14:45:24 +04:00
a5c21745eb
Enable all plan modes when entering quickfort mode
2013-02-09 16:49:36 +13:00
2f4979d3fa
Add Quickfort mode
2013-02-08 00:04:52 +13:00
1956f8b92d
Lock selection mode toggle
2013-02-07 22:57:07 +13:00
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
dff16c3c1d
Define nullptr for gcc < 4.6
2013-02-02 02:24:05 +13:00
ecf255243f
Plugin to easily find and resume suspended constructions
2013-02-02 02:24:05 +13:00
056bde451a
Remove some leftover code
2013-01-29 21:22:17 +13:00
ae8bb7c9f8
Fix for gcc errors.
2013-01-29 20:44:56 +13:00
58125a57a7
Merge remote-tracking branch 'remotes/github/buildingplan'
2013-01-27 23:42:28 +13:00
6546af94ee
Clear persistent data after item assigned. Fix some material selection screen functionality.
2013-01-24 20:16:18 +13:00
f036360688
Add filters for quality, material and decorations.
2013-01-23 23:25:38 +13:00
675e92f350
Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs
2013-01-22 16:34:51 -06:00
f5a0644b45
Fix bad refactor
2013-01-18 23:29:08 +13:00
192baa5638
Building plan plugin: place furniture before it's built. Initial checkin.
2013-01-18 23:28:45 +13:00
e1a2e6ece4
Block and grey out the trade screen actions when search is active.
...
After actually trying the search in game, it is obvious that
clearing search upon pressing the trade button is confusing,
because if you don't pay enough attention, it looks exactly
like as if the trade actually happened.
2013-01-16 20:42:41 +04:00
597074498f
Fix various issues with updated search.
...
- Priority conflict with tweak military-stable-assign.
- The noble screen misbehaves if only one list item is left.
- Noble screen search string not reset after Enter/Esc.
2013-01-16 20:30:11 +04:00
14d41b8eda
Update search to the newer structure definitions.
2013-01-16 18:55:05 +04:00
309f162566
Fix line endings again.
2013-01-16 18:54:35 +04:00
ed0baa3f69
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-16 18:48:59 +04:00
4257c9fe84
Ignore vermin in animals screen search
2013-01-16 18:48:55 +04:00
8741983aaa
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-16 18:48:49 +04:00
655cd3602c
Merge remote-tracking branch 'falconne/search'
2013-01-16 18:30:29 +04:00
940d5fe891
Merge https://github.com/expwnent/dfhack
2013-01-15 23:49:10 +01:00
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
90a62a82f7
Autolabor: add screw pump build labor
2013-01-14 12:12:56 -06:00
c031a7e081
Merge branch 'infiniteSky'
2013-01-13 15:28:31 -05:00
44662de601
Infinite sky: bug with z level flags.
2013-01-13 15:28:17 -05:00
fdcb248ea0
Merge branch 'automaterial_box'
2013-01-12 23:39:50 +13:00
83ef94774b
A better format for toggle strings.
2013-01-12 23:32:30 +13:00
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05:00
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
476afafb3c
Merge branch 'autoSyndrome' into recent
2013-01-07 12:09:55 -05:00
JapaMala
Lethosor
lethosor
Warmist
PatrikLundell
Kelly Kinkade
billw2012
Ben Lubar
KlonZK
Pauli
codefactor-io
Quietust
Vitaly Pronkin
Vitaly Pronkin
Phillip Spiess
Daniel Brooks
Josh Cooper
Dan Amlund
David Timm
ViTuRaS
Ben Lubar
Ben Rosser
David Corbett
jj
nocico
PeridexisErrant
Carter Bray
Eric Wald
Michael Casadevall
carbohydratesn
PeridexisErrant
Japa
expwnent
sv-esk
James Gilles
Nikolay Amiantov
DoctorVanGogh
Fukken-Saved
Adam Watkins
Ross Morgan-Linial
James Logsdon
Daniil Guzanov
scamtank
Chris Dombroski
Timothy Collett
Casey Link
expwnent
Patrick Dawson
expwnent
Alexander "Ace" Olofsson
expwnent
Alexander Gavrilov
hobotron-df
Anuradha Dissanayake
Pierre-David Bélanger
expwnent
Tareq A Khandaker
Petr Mrázek
Robert Heinrich
Bjørnar Hansen
cherrydev
Anuradha Dissanayake