f3e2e5e7d4
Update xml
2016-12-11 18:04:00 -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
3bae9d9d65
Lua API: Make bitfield.whole return an integer, not a decimal
2016-12-10 12:27:43 -05:00
acdb369aa8
Avoid non-trivial bitfield constructors
2016-12-09 13:41:14 -05:00
6e16a7a20c
Update xml, scripts
2016-12-09 11:27:44 -05:00
8521b830b2
Merge remote-tracking branch 'CannibalVox/job_remove' into develop
2016-12-05 15:24:37 -05:00
595f3857b6
Reverse the param order of these two methods
...
The current way doesn't match other Job module methods
2016-12-01 20:13:49 -08:00
7920f71517
Bad formatting
2016-11-25 00:25:18 -08:00
de0e211e07
Figured I could like test my code.
2016-11-24 23:35:03 -08:00
e490afdf00
Rebuilt slightly to offer bool return val
...
We fail on unknown general ref types now, without modifying the job at
all yet
2016-11-24 22:36:11 -08:00
8b964ca2dc
Wipe job_items vector
2016-11-21 06:51:21 -08:00
fba32f2e2f
Also disconnect the job from its items.
2016-11-17 23:25:48 -08:00
67af9f5e82
Add lua bindings for removeJob
2016-11-17 23:04:48 -08:00
74f5df99db
Add job remove method
...
Job remove eliminates a job's worker & holder references, if any, puts
the worker on cd, if appropriate, removes the job's postings, eliminates
the job from the global linked list, and then finally deletes it. This
code was tested by incorporating it into autochop and it does make the
plugin work. However, chop jobs don't have holder building references,
and anyway, with DF being 90% edge case by volume, this could use a heck
of a lot more testing.
I saw elsewhere code that prevented worker removal if the job was a
special job, and that made me feel funny so I made the job remove method
not work if the job is a special job.
2016-11-17 19:54:41 -08:00
ae59b4f5ad
Update xml, scripts
2016-11-10 14:25:05 -05: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
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
b19a0b4305
Update scripts, xml
...
Fixes #1005
2016-10-19 09:53:51 -04:00
b1e3c1088c
Give loadfile() result a better name for tracebacks
2016-10-19 09:53:12 -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
b2424f9a59
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-10-15 10:32:13 +05:30
08cc9f3188
Cast size_t to int explicitly to avoid compiler warning C4267
2016-10-15 10:31:38 +05:30
98ab357df0
Use size_t in both path methods, to avoid warning C4267
2016-10-15 10:17:38 +05:30
9f541481ea
Fix some warnings with GCC -Wall
2016-10-15 00:37:18 -04:00
980b6dd12f
Update XML again.
2016-10-13 19:42:40 +05:30
d5e8b5eeba
Update XML
2016-10-13 19:35:40 +05:30
e6bb7357df
Update xml
2016-10-08 17:09:23 -04:00
f6a91c2f30
Log architecture on startup
2016-10-08 16:58:08 -04:00
70d3c07cdb
Initial lua getDwarfmodeViewDims rewrite
2016-10-07 23:51:58 -04:00
a5338d2f59
Fix rebase_delta type mismatch
...
See #984 . GCC wasn't complaining about this on x64 for some reason.
Also reordered includes.
2016-09-28 20:43:02 -04:00
27d2229665
Fix follow_jmp for 64-bit code - skip REX prefix if found
2016-09-25 18:29:57 -05:00
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
41e298bdfc
Update submodules
2016-08-27 15:27:57 -04:00
85ebbf0e9c
Fix df_expr_to_ref for raw userdata
2016-08-24 17:18:55 -04:00
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
7487f44fc8
Implement a helper to create lua environments with shortcuts (e.g. scr, unit)
...
Used in gui/gm-editor and lua
Closes #977
2016-08-23 21:47:41 -04:00
2dccd1d0ff
Add CheckedArray:__tostring() method
2016-08-22 23:18:30 -04:00
1dab45ffed
Replace lua_pushnumber with lua_pushinteger in LuaApi.cpp
2016-08-22 23:18:08 -04:00
e983e66a1a
Update xml and scripts
2016-08-21 20:59:24 -04:00
70ac99cbfa
Fix Buildings::setOwner() persistence
...
Needed to set bld->owner_id for changes to persist across save/load
Fixes #983 , thanks to Quietust
2016-08-21 20:58:40 -04:00
98a187ca43
Update xml
2016-08-18 17:28:44 -04:00
9e4a6d7591
Update default base address on 64-bit Linux
2016-08-18 17:28:18 -04:00
0b6597ddb2
Stop field_offset from crashing due to missing vtables
...
Now, a pointer to NULL is cast to the type in question, avoiding the need to
call new() or delete() with potentially-misaligned types. Also,
virtual_identity::find has been tweaked to prevent it from crashing on NULL
vtable pointers.
This was suggested by Angavrilov.
2016-08-18 15:59:46 -04:00
c2997b9c79
Fix save_dir
2016-08-18 15:47:40 -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
576174ea0b
Lua: Add lengths of (some) containers to their string representations
2016-08-13 19:52:14 -04:00
eef6f9bfb7
Add df.new() support for char and unsigned long
2016-08-11 00:01:52 -04:00
a1ff432bf8
Restore fixed-width types in string representations of lua fields
...
e.g. tostring(df.new('int16_t')) was returning "<short: 0xaddr>"
2016-08-10 23:58:45 -04: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
6e741b1a80
Merge pull request #969 from Qartar/win64
...
Minor fixes/updates for Visual Studio 2015 Win64
2016-08-10 15:15:44 -04:00
02eef95147
Fix base address for Darwin x64
2016-08-09 20:00:31 -04:00
e22b3b1de7
Use non-fixed-width types in integer identity_traits definitions
...
In some situations (e.g. 32-bit Linux), "intptr_t" is defined as "int", which is
equivalent to "int32_t", leading to issues with duplicate definitions. In other
situations with GCC, "intptr_t" is "long", which isn't covered by any intNN_t
types. Also, definitions for "long" already had to be added on Windows, because
no fixed-width types in MSVC are equivalent to "long".
Switching to non-fixed-width types should hopefully cover all of these
situations. If this doesn't cover any integer types that we need, it will
be caught quickly, e.g. by references to integer_traits<T> in LuaWrapper.cpp.
2016-08-08 11:46:20 -04:00
298d16238e
Remove a few unneeded includes in DataStaticsFields.cpp
2016-08-08 11:45:00 -04:00
aeac8b4fef
Update xml
2016-08-05 18:04:42 -04:00
ee7357b60e
x86: fix vector validity check
2016-08-05 17:51:08 -04:00
dde6901534
x86: fix lua address display
2016-08-05 17:50:49 -04:00
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
44913609c8
Fix format string warnings
2016-08-01 19:03:26 -07:00
79377669a1
Merge remote-tracking branch 'NCommander/dwarfvet' into develop
2016-07-29 16:25:53 -04:00
158f18106f
Merge remote-tracking branch 'NCommander/vs2015' into develop
2016-07-29 15:30:32 -04:00
55970a71ab
Fix Lua::Push for enums
2016-07-29 11:06:16 -04:00
e8fe72826f
Add new integer types to memscan and update find-offsets
2016-07-29 00:05:12 -04:00
dc79e2477b
Expose long/[u]intptr_t to lua and fix some integer return values
2016-07-29 00:02:51 -04:00
b7856fd9f2
Use enable_if for Lua::Push specializations
2016-07-28 22:04:46 -04:00
7b7f7a1b79
Fix support for integer fields in Lua 5.3
2016-07-28 16:36:02 -04:00
41a81f9021
Fix some more warnings (GCC 4.8)
2016-07-28 11:00:52 -04:00
42c620bb9c
Download non-broken libstdc++ on OS X
2016-07-27 21:43:38 -04:00
828fee532a
Switch to downloading zlib.lib and SDLreal.dll on Windows
2016-07-27 21:08:24 -04:00
223c83071e
win64 fixes: doReadClassName, ParseVersion
...
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 20:21:57 -04:00
ddd56d7825
Fix (for win64) and avoid duplicating base address
2016-07-27 20:10:03 -04:00
50144b60ea
A few %08x to %p changes
2016-07-27 19:54:19 -04:00
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
3833ff2e09
proper 64bit address formatting
2016-07-26 23:30:50 -04:00
a684e1dd0f
Merge remote-tracking branch 'lethosor/64-bit' into develop
2016-07-26 22:54:36 -04:00
e10397370b
Merge branch 'develop' of github.com:DFHack/dfhack into vs2015
2016-07-11 18:59:22 -05:00
ed6fb69012
Fix whitespace spacing
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-07-11 18:54:03 -05:00
cede0528f2
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-07-06 21:00:20 -04:00
39aa143cfa
Update NEWS and submodules
2016-07-06 20:59:49 -04:00
4f96bdd0eb
Merge pull request #950 from TC01/linux-system-tinyxml
...
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
2016-07-06 20:37:28 -04:00
2de2e6a983
Update CMakeLists and submodules
2016-07-06 20:30:28 -04:00
b4063352cf
Fix crash in vprinterr due to va_list misuse
2016-07-03 23:33:07 -04:00
2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
163207e362
Give more feedback for DF detection failures with mismatched XML versions
...
This may help address issues where people forget to read the documentation,
don't run "git submodule update", and end up with a df-structures version
that's too old (which is somewhat common, it turns out).
2016-06-30 20:42:27 -04:00
cfaba3ec71
Update various references to scripts/ and mention old git issues in Compile.rst
2016-06-29 19:38:15 -04:00
af906d6582
Remove library/scripts submodule
2016-06-29 19:06:00 -04:00
ae55d2d526
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
...
As best as I can tell, the copy of tinyxml dfhack uses is unmodified
from whenever it was first bundled. This commit adds an option to CMake,
EXTERNAL_TINYXML, that if set to ON, will attempt to link against a system
tinyxml instead of using the dfhack-bundled one. It defaults to OFF,
so there is no change in default behavior.
The DFHACK_TINYXML variable is then set to either "tinyxml" or "dfhack-tinyxml"
so the library (and any plugins that need updating) can link against one
or the other.
The FindTinyXML.cmake script was taken from https://github.com/ros/cmake_modules
(licensed under the 3-clause BSD license).
Add license text to new CMake file.
2016-06-29 17:53:16 -04:00
d509cf2fb5
It helps when you pop pragmas
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 09:39:46 -05:00
d49032ef73
Supress a lot of compiler noise in hopes of finding real errors. Right now, a plugin free DFHack can be built with VS2015
2016-06-28 08:34:11 -05:00
b338d0218e
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-06-20 13:22:25 +05:30
36aafd550b
Increased the message size limit in RemoteClient from 8mb to 64mb.
2016-06-20 13:17:30 +05:30
6d1c4cd9ce
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-16 23:37:21 -04:00
a7d5c2132a
update xml
2016-06-16 23:37:01 -04:00
0918efd02d
fix word_wrap not returning a value.
2016-06-16 20:52:16 +05:30
27a84a8246
Move scripts to library/scripts
...
git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule.
2016-06-15 18:45:08 -04:00
9de4550fde
Update submodules
2016-06-15 12:11:20 -04:00
022a1bf9e8
Wrap script descriptions in `ls` output and remove description length cap
2016-06-14 21:24:27 -04:00
4f3a2b39d7
Update xml
2016-06-14 13:21:59 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
a2b2c66798
Merge pull request #931 from warmist/advfort2
...
Advfort2
2016-06-14 09:45:33 -04:00
90c7dc41ec
Update where library/xml to point to current master
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 17:10:58 -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
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
a47a1c83ba
Update xml, clsocket
2016-06-07 08:17:40 -04:00
fa1c589391
Update xml
2016-05-30 16:58:51 -04:00
d44bc069ad
Merge remote-tracking branch 'BenLubar/thread-memory-leak' into develop
2016-05-30 16:24:42 -04:00
9fc43cff4d
Make const method wrappers possible
...
Reverts ae3052f#935
2016-05-28 20:11:42 -04:00
113325f885
update xml
2016-05-28 10:29:53 -04:00
ae3052f79a
Make knowledge_scholar_category_flag::value() non-const
...
const methods can't be wrapped at the moment, at least without changing things
in DataFuncs.h
2016-05-28 10:28:22 -04:00
4d3df60470
Update xml (offsets)
2016-05-27 17:51:01 -04:00
c1ba435058
Update version and xml
2016-05-27 17:41:23 -04:00
e76258b040
knowledge category flag
2016-05-26 15:15:42 -05:00
700392ba55
Fix tinythread memory leak in two ways:
...
1. update to tinythread version 1.1, which provides a detach method
2. move the thread disassociation to the join function, which allows
attached threads to be joined even after they finish (this was the main
leak)
Also update RemoteServer.cpp to detach threads and delete the thread
objects instead of leaking them (although they are much smaller than the
actual threads).
2016-05-21 19:17:08 -05:00
6c64b3441d
Fixes to gui/advfort.lua
2016-05-20 13:55:59 +03:00
d93cf2cd2e
Update xml
2016-05-17 23:26:21 -04:00
b7aa8aca26
Update xml
2016-05-14 22:27:21 -04:00
1832e563b7
Update xml
2016-05-14 19:41:41 -04:00
a89251cdf8
Find job in job screen
2016-05-14 16:07:27 -04:00
118d88e44f
Update xml
2016-05-14 16:07:10 -04:00
55e58e5f06
Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins
2016-05-14 11:43:37 -04:00
97f7cd6081
Bump version and update xml
2016-05-12 16:03:33 -04:00
fee6e57b40
Disable viewscreen_layer_workshop_profilest focus handler for now
2016-05-11 17:52:56 -04:00
ed81be16b3
Improve logging of vtable interpose errors
2016-05-11 17:52:10 -04:00
38051a5a48
remove tweak manager-quantity
2016-05-11 17:51:57 -04:00
b53f829737
Update to 0.43.01-alpha0 and update xml
2016-05-10 17:48:50 -04:00
c1e44c178f
Add on_click/on_rclick handlers to widgets.Label
...
Closes #919
2016-05-09 21:30:34 -04:00
402a96b0e6
Expose new unit functions to lua and add some basic safety checks
2016-04-23 21:52:50 -04:00
bc7c689d93
update xml
2016-04-23 20:33:03 -04:00
52728babd4
Merge branch 'develop' into zone-unassign
2016-04-22 18:41:15 -04:00
b36193857c
Add string:startswith(), endswith()
2016-04-16 17:13:41 -04:00
0d37209063
use trade_state enum
2016-04-13 09:44:57 -04:00
7c91b8f755
Add more informative focus_path
...
This with conjunction of changes in eventful will make the sidebar overlay more bug-free :)
2016-04-10 16:53:18 +03:00
8b8ce4eff9
Spelling mistake
2016-04-10 15:45:43 +03:00
d1c45d00d2
Fix some bugs in workshopOverlay
...
Fix bugs relating to "remove building"/"suspend remove" part of overlay.
2016-04-10 14:44:09 +03:00
80521d1bb1
add onGetSelectedBuilding to workshop overlay
...
This will make other stuff that depends on dfhack.gui.getSelectedBuilding work with workshop overlay
2016-04-10 12:28:15 +03:00
49863a9f32
Add a file-like lua JSON wrapper
2016-04-08 17:40:14 -04:00
b97d33ca28
moveToBuilding improvements
...
- Don't set in_building by default when use_mode is 0 (consistent with most vanilla DF items)
- make use_mode optional and default to 0 (including in Lua API)
Resolves #885
2016-04-05 11:43:02 -04:00
d9e368cab4
Update xml
2016-04-03 21:10:02 -04:00
e0ae7bde79
Add Lua primitives: ptr-string, pointer, ptr-vector, bit-vector, bit-array
...
These are most useful with df.reinterpret_cast, but df.new can also be used for
most of these (except ptr-string)
2016-04-03 20:48:57 -04:00
37c81df21c
Add reverse vtable name lookup
2016-04-03 20:45:44 -04:00
a49f313f84
update xml
2016-04-03 13:34:52 -04:00
ec5e91bd6a
Update xml
2016-03-28 21:00:27 -04:00
b115fdc73f
Load script paths from dfhack-config/script-paths.txt
2016-03-27 15:56:23 -04:00
866d31f121
Update xml
2016-03-26 11:12:06 -04:00
af4a3428a6
Split DataStaticsFields into multiple compilation units
2016-03-22 17:34:25 -04:00
b8bbf5f545
field_offset: Use actual type instances instead of reinterpret_cast(type, 1)
...
ui_build_selector is a virtual class as of 0.42.06, so reinterpret_cast-ing it
with bad addresses will crash. 'df.new(df.ui_build_selector)' works just fine.
2016-03-22 17:27:53 -04:00
a3ddc63836
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2016-03-20 16:30:49 +05:30
e505bf0a58
Update xml
2016-03-18 17:05:59 -04:00
76793045a9
Only block keyboard events in OS X SDL_PollEvent hook without focus
...
Blocking all events causes issues with window manager controls when the window
is not focused - for example, DF doesn't resize certain screen buffers, leading
to flickering in OpenGL print modes.
2016-03-13 10:33:25 -04:00
f8ff447cb5
Add a check to the histfig fix and tweak NEWS.
2016-03-10 08:50:03 -05:00
fd132d3fe7
Fix persistent histfig crashbug.
2016-03-10 08:38:55 -05:00
cbb4275a44
Update xml
2016-03-09 14:54:24 -05:00
dd9f1bf759
make world friend of machine and building handlers to allow use their
...
protected constructor
2016-03-09 13:03:16 +02:00
c700847bcf
Remove a couple unneeded includes
2016-03-04 20:23:00 -05:00
c595f7908a
Update xml
2016-03-04 20:22:09 -05:00
9da79544de
fix Units::isCitizen
...
fixes a lot of issues where plugins ignore non-dwarf citizens and work
with dwarf mercenaries and bards, where it shouldnot
2016-03-04 22:48:33 +02:00
8eb39cc1d0
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-03-03 23:19:03 -05:00
0db3c72557
Update xml
2016-03-03 23:18:36 -05:00
d508028bcc
fix job-duplicate (do not clone posting_index)
...
if job cannot be done right now, game puts it in df.global.world.job_postings
when job finally can be done, game removes job from postings and clears posting_index
that index should not be cloned by job-duplicate(new jobs(added by vanilla way) have that value -1 always anyway)
cloning posting_index into the new job causes that job to be ignored
2016-03-03 21:32:16 +02:00
5334bd8a6a
Bump version to 0.42.06-alpha0 and update xml
2016-02-28 11:18:27 -05:00
5bb19a230f
getKillCount: also search kills->events
2016-02-25 15:34:56 -05:00
25507a10f9
Add Units::getKillCount() and expose it to Lua
2016-02-25 15:21:14 -05:00
3e44aabf12
Expose Units::getSquadName to lua
2016-02-25 15:19:35 -05:00
297bbd6f20
Merge remote-tracking branch 'warmist/develop' into develop ( closes #772 )
2016-02-24 17:24:03 -05:00
83c70ccb0f
forbid manipulator editing non-citizens
2016-02-11 13:31:52 +02:00
fafe1e9ce1
Update xml
2016-02-03 23:19:41 -05:00
d4988c5faf
Add no handler version of lua event.
2016-02-01 22:22:12 +02:00
0a670bb0db
Implement #804 , move some functions to Units, colorize zone output, a
...
little cleanup
2016-02-01 11:12:06 -05:00
2d23a848cc
git-describe: Add git xml information
2016-02-01 10:30:53 -05:00
77466f01e0
Merge remote-tracking branch 'BenLubar/benlubar-valgrind' into develop
2016-01-31 14:52:04 -05:00
248331a196
buildingplan: Support floodgates, grates, bars
...
See #808
2016-01-31 14:50:07 -05:00
ea9261f5b5
allow dfhack to run inside valgrind
...
valgrind replaces the readlink system call, but not the open system
call. By calling readlink first, we guarantee that /proc/self/exe is the
actual Dwarf Fortress executable and not the valgrind executable.
See also: https://bugs.kde.org/show_bug.cgi?id=86921
2016-01-31 13:34:07 -06:00
80fd2270db
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-01-31 14:22:57 -05:00
a316dfa074
set floodgate flags correctly when allocating it in lua or c++
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/plugins/ruby/building.rb#L63
2016-01-29 14:50:50 -06:00
80ecbbd369
get rid of "private" comment in BitArray.h
2016-01-21 16:49:16 -05:00
675d173266
set civzone number when constructing a civzone
2016-01-18 14:46:39 -06:00
0b2ba377be
Update xml
2016-01-18 11:49:37 -05:00
ab8cce2a86
Update xml
2016-01-18 10:13:16 -05:00
0bcc8dc443
exportlegends: fix day/month issues more reliably
...
Fixes #783 , #791
2016-01-09 19:28:12 -05: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
93fe222c35
Revert #719
...
No plugins built prior to the symbol naming change in 4fc6cb6f
2016-01-01 11:20:54 -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
ef62c044a3
Update NEWS, xml
2016-01-01 10:30:02 -05:00
31745f4a36
Fix a couple exportlegends issues and update xml
2015-12-31 14:32:31 -05:00
090787e927
Update xml
2015-12-31 13:41:46 -05:00
2079093d5a
Fix new addresses in export-dt-ini
2015-12-28 23:19:02 -05:00
22283066ca
Update xml
2015-12-28 17:30:05 -05:00
39086acf64
Merge export-dt-ini changes from splintermind/Dwarf-Therapist
2015-12-28 15:46:42 -05:00
c23ac50250
Always run dfhack.init-example if dfhack.init doesn't exist
...
This previously only happened if no files matching *dfhack*.init
existed
2015-12-27 16:39:10 -05:00
e075a06486
Add search controls to all viewscreen_petst subpages
2015-12-27 15:49:10 -05:00
d087f4f741
Expose process MD5/PE to Lua (useful in export-dt-ini)
2015-12-27 14:59:18 -05:00
a977f274b1
Update xml
2015-12-26 20:00:09 -05:00
fabff1ddfb
Fix df::occupation usage
2015-12-26 19:59:54 -05:00
5263d425a2
Merge remote-tracking branch 'BenLubar/benlubar-init-args' into develop
2015-12-26 13:47:58 -05:00
106891f6e0
vim-style +-args. for example, "./dfhack +echo foo" would be equivalent to running ./dfhack and then typing "echo foo" into the console. uses shell argument splitting, so "./dfhack +somecommand 'foo bar' baz" does the right thing. See DFHack#755.
2015-12-26 12:10:44 -06:00
9a82f59518
Merge remote-tracking branch 'BenLubar/benlubar-init-args' into develop
2015-12-26 11:49:45 -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
64d861bf6b
Add support for viewscreen_locationsst to various gui functions
2015-12-25 11:09:13 -05:00
25e808be38
Update xml
2015-12-23 17:45:08 -05:00
e3e68a8df9
Add a search option to the location occupation menu
2015-12-23 16:57:43 -05:00
14f1e6b06c
Improve prerelease warning somewhat
2015-12-22 19:34:54 -05:00
2a2ab00ca9
Add "map" parameter to a lot of drawing functions
...
Ref #746
2015-12-22 11:42:51 -05:00
10c72a3d5d
Fix produce() call in modules/Items.cpp
2015-12-22 09:46:01 -05:00
e4ff4fe64c
Update xml
2015-12-22 09:43:17 -05:00
ef27018545
Update xml
2015-12-20 15:19:32 -05:00
eeb0fc7a0f
update xml
2015-12-19 23:12:26 -05:00
eb1ae54d63
Add ui_lever_target_type scan to find-offsets
2015-12-19 17:09:29 -05:00
ea79fc692a
Update xml
2015-12-19 11:07:42 -05:00
5a1e5e1464
Expose Units::casteFlagSet()
2015-12-19 11:07:35 -05:00
ca29f60518
update xml
2015-12-18 23:09:27 -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
347a112aa1
Add support for 11-argument function wrappers
...
Needed by item::addImprovementFromJob() as of 0.42:
dfhack/df-structures@f6361e2
2015-12-18 17:45:23 -05:00
9bccf457c5
Check for ui_sidebar_menus being null before using it.
2015-12-17 10:54:19 -06:00
80ec5ab043
vim-style +-args. for example, "./dfhack +echo foo" would be equivalent to running ./dfhack and then typing "echo foo" into the console. uses shell argument splitting, so "./dfhack +somecommand 'foo bar' baz" does the right thing. See DFHack#755.
2015-12-13 14:03:25 -06: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
1329acc516
Update xml
2015-12-11 20:34:48 -05:00
83603fcf45
Add prerelease build flag and warning script
2015-12-11 20:27:46 -05:00
571df39878
Update submodules
2015-12-11 16:35:42 -05:00
7e9d6fba86
Update xml
2015-12-09 20:03:14 -05:00
448e367d4d
Update xml
2015-12-08 17:32:13 -05:00
a3d6d16757
Update xml
2015-12-07 17:14:46 -05:00
02d2405d1f
Update xml
2015-12-07 16:34:47 -05:00
49ad153d4b
Update xml
2015-12-06 17:12:46 -05:00
3b2ace95f8
Make SDL_UpperBlit hook check core status first
2015-12-05 20:07:54 -05:00
b63270162d
Update xml
2015-12-04 23:12:49 -05:00
7a69b90277
Update xml
2015-12-02 16:27:51 -05:00
8b406cc0b3
Make a separate copy of DF's SDL library to link against on OS X
...
Linking to any library with ".framework" in its path on OS X causes
that directory to be included in the include path (with -F), which
causes all of the DFHack core to be rebuilt unnecessarily when
changing DF folders.
2015-12-01 17:35:39 -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
df4fb70be2
Provide more suggestions for unrecognized commands
2015-11-25 20:22:14 -05:00
610170b0b0
Add hooks for getDwarfmodeViewDims and getDepthAt (new)
2015-11-15 11:54:34 -05:00
1ff9277e12
Remove plugin export functionality (unused)
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
875ecf7827
Update Core::top_viewscreen before calling state change handlers
...
This was previously done right before SC_VIEWSCREEN_CHANGED events
were handled, meaning that code handling earlier events that used
top_viewscreen (rather than getCurViewscreen()) could refer to an
invalid viewscreen, i.e. in the tick after it was deleted.
Fixes #747
2015-11-14 21:48:51 -05:00
2882422a3e
Don't require short script help to start with a space
...
Ref #742
2015-11-09 22:58:46 -05:00
3fb2628921
Add a Lua implementation of next_enum_item()
2015-11-07 15:22:30 -05:00
051244c8d6
Fix GCC compile error
2015-11-06 20:05:14 -05:00
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05: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
867b733a04
Fix a few GCC warnings on Linux (GCC 4.6)
2015-11-05 21:48:13 -05:00
8412a496dd
Remove extra check for "type" command
2015-11-05 19:09:14 -05:00
23b02ebcf2
Update xml
2015-11-05 16:17:52 -05:00
e2a1658124
Update xml
2015-11-04 21:42:04 -05:00
14707e7d81
Merge pull request #719 from DoctorVanGogh/r3compat
...
Allow loading (external) plugins compiled against r3
2015-10-31 19:12:07 -04:00
c6220c9703
Remove tabs/trailing whitespaces
2015-10-31 23:43:57 +01:00
6e5d9c23e5
Merge pull request #715 from DoctorVanGogh/webfix
...
Add 'undisturbed' flag to job item checks
2015-10-31 11:28:25 -04:00
7da3c65079
Fix display of arrows in lua filtered list widgets
...
Fixes #718
2015-10-30 19:16:29 -04:00
83991d2a22
plug: Don't color loaded plugins
2015-10-30 18:45:55 -04: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
1250bb5204
type: Provide more useful information (script paths, plugin names)
2015-10-27 17:34:32 -04:00
4e0f426bba
Fix code formatting
2015-10-26 02:37:44 +01:00
ba53f3c035
Add 'undisturbed' flag to job item checks
2015-10-26 02:19:41 +01:00
fb4d16f477
Enable loading of r3 plugins
2015-10-25 00:04:49 +02:00
8de710f1c1
Add Renderer module - safer way to install custom renderers
2015-10-21 17:18:39 -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
5387c03ea0
DFHackVersion: Expose whether the built commit is tagged
2015-10-17 15:35:40 -04:00
d3dbc6225a
Implement getViewscreenByType() in lua
2015-10-17 15:11:04 -04:00
96df70fe0b
Use TCSADRAIN when disabling raw mode as well
2015-10-14 15:58:27 -04:00
632a809d6f
Update xml
2015-10-11 11:39:16 -04:00
c2267013b4
plug: List enabled state
2015-10-03 13:42:20 -04:00
3f5c002634
Pass virtual_identity by reference
2015-10-03 09:27:24 -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
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
b16e59b91c
Check for existence of save folder before attempting to log events
...
cur_savegame.save_dir can be populated when the save directory does
not yet exist after world generation (since the game can be aborted
at that stage without saving).
2015-09-26 14:26:44 -04:00
fa60ccdd52
Don't find scripts from the last loaded world's raw/scripts folder
2015-09-26 14:26:13 -04:00
b679a0c482
Update xml
2015-09-26 13:45:51 -04:00
2bcf74d74c
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-09-26 10:46:45 -04:00
ec17685041
CMake: Add compiler checks and GCC version checks
2015-09-26 10:46:29 -04:00
dfe9ec90f2
Update XML.
2015-09-25 19:43:14 -04:00
a188b9d567
Merge branch 'third-party-scripts' into develop
2015-09-25 17:48:25 -04:00
5bcff42800
Add third party scripts.
2015-09-23 23:46:26 -04:00
788860efb6
Log more information about version information on startup
...
May help address #653
2015-09-22 20:01:05 -04:00
91a1836439
Fix a few issues with init file variations
...
* GCC does not allow std::string instances or enums without a base
type to be passed as varargs
* Fixed path concatenation issue causing dfhack.init to not be loaded
2015-09-21 18:57:58 -04:00
2c9b268184
Merge pull request #689 from expwnent/develop
...
Generalize dfhack.init so it looks for more files in more places, for onload, onunload, etc.
2015-09-21 17:33:52 -04:00
af90d14cb2
Use shenanigans to make a certain table const.
2015-09-21 17:24:51 -04:00
051a1f9661
Update xml
2015-09-19 18:00:59 -04:00
a56a427d12
Make Filesystem::is* functions handle nonexistent paths properly
...
If stat() failed, these functions could read from an uninitialized
stat struct and return "true" for paths that didn't exist.
2015-09-19 17:34:58 -04:00
5bf3093139
Now it looks for dfhack*.init instead of just dfhack.init, onLoad*.init instead of just onLoad.init, etc.
2015-09-15 07:27:42 -04:00
d696832efa
Merge branch '3rd-party-scripts' into develop
2015-09-14 16:52:13 -04:00
9eb86c7e38
Support additional script search paths
...
These can currently be added/removed from C++ or through the Lua API.
2015-09-06 16:23:02 -04:00
66c7a461fd
Don't attempt to copy non-files into dfhack-config
2015-09-03 15:02:51 -04:00
9eac4585b1
keybinding: support 0-9, F10-F12
2015-09-02 15:56:53 -04:00
949e4d42cf
Remove MacPool.*
2015-08-29 19:42:32 -04:00
906fba9b54
Update xml
2015-08-26 16:41:04 -04:00
81ef17df32
Update xml
2015-08-25 10:23:59 -04:00
29a0aee44c
Implement strnlen on OS X <= 10.6
...
Fixes #182
2015-08-24 17:51:42 -04:00
19f966aefc
Improve some plugin-related error handling
2015-08-16 17:28:31 -04:00
5717c2cdd4
Don't set plugin state to PS_BROKEN due to load failures
2015-08-16 17:02:53 -04:00
a5f15b279c
plug: Include deleted plugins in full list
2015-08-14 19:32:41 -04: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
1bf3a6a37a
Update xml
2015-08-14 10:46:05 -04:00
2aba2da56d
Avoid DataStaticsFields dependency on PluginManager.h
2015-08-11 22:59:19 -04:00
9c84c78129
Make lua listdir functions return useful error messages
2015-08-10 12:44:27 -04:00
d09cdc83ba
Update xml
2015-08-10 11:25:15 -04:00
dc747d59df
Link dfhack-md5 on Windows
2015-08-09 13:20:28 -04:00
418d2831ef
Add a framework for including 3rd-party script repos
...
Repos need to include a CMakeLists.txt file with calls to the
DFHACK_SCRIPTS macro, which functions similarly to DFHACK_PLUGIN.
The `open-legends` script from lethosor/dfhack-scripts is included
as an example.
2015-08-06 21:50:01 -04:00
f46d3d137f
Allow multiple contexts to be specified when adding keybindings
2015-08-06 20:41:54 -04:00
afce8d810b
Update xml
2015-08-06 17:32:42 -04:00
de49befdbb
Improve version information
...
* Add reimplementations of old DFHACK_VERSION-style macros
* Expose full git commit ID
* Expose all DFHack::Version functions to Lua
2015-08-06 17:30:51 -04:00
a67326ad00
git-describe: always use long format
2015-08-06 17:01:11 -04:00
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
cc5045d6df
Fix Alt-E/U/N bindings on OS X
2015-07-29 10:32:19 -04:00
f387eb2960
Fix an issue where Ctrl-*-A and Ctrl-*-Z keybindings were not properly detected
2015-07-29 09:35:09 -04:00
786086e5c5
Make non-CR_OK return values for SC_BEGIN_UNLOAD events abort unload
...
Returning CR_FAILURE, for example, is more consistent with
plugin_shutdown().
2015-07-28 18:36:20 -04:00
e51779b08c
Update xml
2015-07-27 21:40:04 -04:00
7eb4c33cb1
Cache result of getPath() on darwin
2015-07-27 20:32:33 -04:00
03aa2399a0
Add environment variables to skip global and vtable initialization
2015-07-23 23:25:01 -04:00
27295a9b6f
Log DFHack and save-specific information on world (un)load events
2015-07-23 23:24:00 -04:00
c34e9bb657
Update xml
2015-07-22 17:27:57 -04:00
fc094e2dbc
OS X: Check for existence of SDL.framework before building
2015-07-21 16:26:41 -04:00
83f89480aa
Update xml
2015-07-18 14:10:53 -04:00
22ea68e68a
Use is_valid_enum_item in FOR_ENUM_ITEMS
...
This is part of the workaround for
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43680
Fixes DFHack/dfhack#654
Fixes JapaMala/armok-vision#21
2015-07-18 12:57:12 -04:00
74404c62e7
Fix deadlock when aborting plugin load
2015-07-17 16:00:41 -04:00
797e9b4485
OS X: Prevent DF window from receiving input when not focused
...
This partially fixes DFHack/stonesense#32 , in the sense that input
to Stonesense is no longer received by DF, but does not cause
Stonesense to receive input either.
2015-07-17 13:49:17 -04:00
2afc1c6d3f
Update xml
...
viewscreen_choose_start_sitest fixes
2015-07-17 13:48:49 -04:00
527b17d964
Update submodules
2015-07-04 20:45:37 -04:00
95e04ef56a
Update xml
2015-06-30 16:10:49 -04:00
6cfc855e19
Use getcwd() in Process::getPath() on OS X
...
The "dfhack" script sets up the proper working directory
2015-06-29 10:11:46 -04:00
0f3753095b
update xml
2015-06-29 10:10:44 -04:00
716ce1c9e2
Update xml
2015-06-26 23:20:59 -04:00
935f4dd628
Log plugin load information to stderr
2015-06-26 16:11:41 -04:00
5d1ae9f5ed
Allow plugins without git description to be loaded
2015-06-25 11:46:04 -04:00
524593a3d3
Locate git with find_package
2015-06-25 11:43:54 -04:00
ee7a2c7db7
Add git commit information to libdfhack-version
...
git is run every time 'make' is run, but the generated include file
is only updated when necessary. Plugins will be loaded successfully
if their DFHack version matches core's (assuming OpenLibrary()
succeeds), but will produce a warning if their git commit doesn't
match core's.
2015-06-24 19:32:45 -04:00
0fa5570349
Recognize newline characters in Linux/OS X console
2015-06-24 00:54:12 -04:00
f3d91b3606
Update xml
2015-06-22 23:16:28 -04:00
5bb5d87ad8
Install default dfhack-config files
...
Files from the "dfhack-config" source directory are now installed to
"dfhack-config/default" and copied to "dfhack-config" on startup if
they don't already exist. Previously, config files weren't available
at all unless they were manually installed (93c9a41
2015-06-18 08:59:01 -04:00
73de6a3051
Update xml
2015-06-15 12:58:49 -04:00
6fb6645ed5
Merge branch 'dwarfmonitor-widgets' into develop
2015-06-15 12:55:26 -04:00
862389d217
Allow lua scripts to redirect to other lua scripts
...
Addresses #634 , #638
2015-06-14 11:56:14 -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
d663784707
Detect null unit pointer in Items::createItem()
2015-06-09 14:02:42 -04:00
bb93f2e40f
Fix circular lua script dependencies
2015-06-05 19:08:11 -04:00
36fde3d7e3
Allow Lua screens to allow OPTIONS to work
2015-06-05 18:45:52 -04:00
96f3bdafb4
Implement an internal command to interrupt running Lua scripts
...
This inserts a debug hook that runs every 256 instructions by
default, which has a minimal impact on performance.
2015-05-24 19:06:01 -04:00
e27493fa02
Treat plugins without a "plugin_dev" symbol as ordinary plugins
2015-05-24 11:42:22 -04:00
6278c94775
Update xml
2015-05-16 14:27:17 -04:00
db08df7e50
Update xml
2015-05-09 19:41:19 -04:00
b6ec48c99a
Add a macro that allows exported functions to use different names
2015-05-09 09:42: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
a47a5f8b0a
Add an alternative to script_environment() that requires scripts to
...
recognize use as a module
Also document the use of enable/disable with lua scripts
2015-05-09 09:21:00 -04:00
42a6cfaee6
Improve Lua enable/disable error handling
2015-05-08 18:03:19 -04:00
eaf282c18e
Allow lua scripts to be enabled and disabled with built-in commands
2015-05-08 18:03:19 -04:00
db423c1aa6
Allow Lua scripts to specify whether they can be used as a module or
...
enabled/disabled
2015-05-08 18:03:18 -04:00
lethosor
David Corbett
Stephen Baynham
Japa
Quietust
Lethosor
Carter Bray
Vitaly Pronkin
Michael Casadevall
Ben Rosser
Ben Lubar
Warmist
Japa
expwnent
sv-esk
James Gilles
DoctorVanGogh