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
Japa
lethosor
Kelly Kinkade
Lethosor
Carter Bray
Vitaly Pronkin
Eric Wald
Michael Casadevall
carbohydratesn
Ben Lubar
PeridexisErrant
Warmist
Japa
expwnent
sv-esk
James Gilles