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
e73a2f8778
Move script internals to a single table
2015-05-08 18:03:18 -04:00
51d61d91cb
Change tabs to spaces.
2015-05-07 20:50:19 -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
a4a2b2f1de
Use TCSADRAIN instead of TCSAFLUSH when initializing raw mode
2015-04-19 11:58:35 -04:00
3ca00f85d0
Merge remote-tracking branch 'lethosor/json' into develop
2015-04-08 20:18:13 -04:00
62cfd0b8ca
Reset DYLD_INSERT_LIBRARIES on startup on OS X
...
This prevents subprocesses (e.g. those launched with Lua's os.execute)
from attempting to load libdfhack.dylib and aborting due to an
architecture mismatch.
2015-04-06 17:05:36 -04:00
4b124bc022
Avoid including DFHackVersion.h in PluginManager.h
...
Changes to DFHackVersion.h previously required recompiling nearly all
of the DFHack core.
2015-04-03 14:02:14 -04:00
7758311f88
Make gametype functions use default arguments when called from Lua
2015-04-02 16:55:27 -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
8b5b8ed864
Log command name collisions
2015-04-01 17:32:11 -04:00
e71c55865d
Merge pull request #591 from lethosor/penarray
...
Expose a faster screen drawing/caching API to Lua
2015-03-31 16:11:28 -04:00
331be2b589
Make "keybinding list" accept a context
...
See #588
2015-03-30 19:03:16 -04:00
bbb41078e7
Expose PenArray dimensions and tiles to Lua
2015-03-28 18:35:07 -04:00
e2b6ae9beb
Allocate Lua PenArray objects using an existing buffer
2015-03-28 11:27:47 -04:00
99f4ea4d2b
Implement a PenArray class for caching parts of rendered screens
2015-03-27 22:56:30 -04:00
ac2f537bf4
Merge branch 'async-zoom' into develop
2015-03-26 19:41:02 -04:00
ee16c6d1ab
Fix "delete" in console on OS X/Linux
2015-03-25 23:31:23 -04:00
7f98a632ce
Update xml
2015-03-25 17:58:00 -04:00
01c6d05775
Add custom enabler::zoom_display() method (screen.zoom in Lua)
2015-03-25 17:55:56 -04:00
42e4f584b9
Add SDL_SemWait and SDL_SemPost hooks
2015-03-25 16:08:25 -04:00
38fa416ad1
Lua: Indent array values
2015-03-22 14:04:03 -04:00
96e5c5d2fd
Fix whitespace
2015-03-20 19:55:32 -04:00
b976053be0
Add Lua JSON library
2015-03-20 19:51:24 -04:00
f3508f82c1
Add jsonxx to depends/
2015-03-20 15:45:38 -04:00
625be319c9
Re-enable memory range logging on OS X if an environment variable is set
2015-03-19 19:37:10 -04:00
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
016f67e83f
Expose strerror to Lua
2015-03-10 16:32:43 -04:00
afca7419dc
Add gametype checks to World.cpp
2015-03-09 20:08:21 -04:00
ea1c9fa0df
Allow plugin exports to be defined in plugins (and looked up when needed)
2015-03-07 17:25:35 -05:00
1570af3f4d
Allow plugins to export additional functions through a class
2015-03-07 15:56:43 -05:00
1591e67bf2
Replace backslashes with forward slashes in command names
2015-03-06 16:53:57 -05:00
0c09feae5b
Prevent backslashes from being used in command names
2015-02-27 18:46:29 -05:00
45acf61b17
Update xml
2015-02-26 16:12:12 -05:00
88ff51c755
Add PushEvent hook on OS X
...
See #553
2015-02-21 21:28:35 -05:00
bd809d7bbc
Replace most interposed functions with dlsym wrappers on OS X
2015-02-21 21:28:35 -05:00
db9bcc27e4
Make plugin load errors more descriptive
2015-02-21 21:28:35 -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
c399377f08
Ensure that command usage information always ends with a newline
2015-02-16 20:17:47 -05:00
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
a8a8fc43ef
Add df2console() wrapper
...
Closes #522
2015-02-13 17:56:29 -05:00
56dfc66309
Implement map load/unload scripts and allow additional scripts to be registered
2015-02-11 15:03:47 -05:00
37f391ea6d
Don't store runScript() in script environments
2015-02-10 17:22:16 -05:00
337598e0d6
Restore lua environment persistence and update modified timestamp correctly
...
See #544
2015-02-10 16:36:21 -05:00
e3b67b2985
Use short plugin name in error messages when possible
2015-02-09 22:06:33 -05:00
15d3b7831f
hide/show: Provide feedback on unsupported platforms
2015-02-08 09:30:40 -05:00
a1691b6777
Merge remote-tracking branch 'warmist/console-hide' into develop
...
Conflicts:
library/Console-darwin.cpp
2015-02-08 09:20:05 -05:00
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
712892fb71
Only reload and recompile Lua scripts if they have moved or been updated.
2015-02-02 02:24:43 -05:00
bf5e491647
Allow Lua scripts to be used as modules.
2015-01-31 22:43:54 -05:00
92bd6349a7
Fix listdir_recursive on Windows.
2015-01-31 22:28:17 -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
aa5d7c11bc
Merge remote-tracking branches 'lethosor/patch-12' and 'lethosor/fs-expansion' into develop
...
Conflicts:
NEWS
2015-01-31 20:25:01 -05:00
066adfdf95
Implement a function to list directories recursively
2015-01-30 17:29:17 -05:00
3ab558c72d
Check for init.lua existence properly
...
Fixes #501
2015-01-30 16:37:23 -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
868a9944fd
Update LuaApi for new Units/Buildings functions.
2015-01-29 14:59:06 -05:00
86495270a6
Remove duplicate isMilkable definition.
2015-01-29 14:40:09 -05:00
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
1514233aaa
Add missing null checks to Units.cpp
2015-01-29 13:57:50 -05:00
daf739fcec
Remove FIFO support
2015-01-28 21:39:17 -05:00
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
f98e2964e6
Fix a few Windows compilation errors
2015-01-28 20:05:24 -05:00
bebceffa5f
Add Filesystem::listdir()
2015-01-28 19:15:58 -05:00
e8c0482fdc
Add atime()/ctime()/mtime()
2015-01-28 18:18:06 -05:00
2e3261565c
Clean up Filesystem.h
2015-01-28 17:15:09 -05:00
1445b0a919
Allowed Lua scripts to share variables with run_script and corrected dfhack.findScript so that it can find save-specific scripts.
2015-01-26 21:45:31 -05:00
4c5b6a5282
For multiline comments, delete the backslash instead of changing it to a space.
2015-01-26 19:24:31 -05:00
1993c5fb1b
Added support for multiline commands inside dfhack.init and the script command.
2015-01-26 17:18:30 -05:00
4e447fc19a
Update XML.
2015-01-25 14:08:42 -05:00
dda780eb8e
Update xml.
2015-01-23 21:53:35 -05:00
a9f2c5bc90
Change MOD_* to DFH_MOD_*
...
MOD_* constants are defined in Winuser.h on Windows
2015-01-17 08:56:49 -05:00
592d42c665
Update xml (0.40.24 OS X offsets)
2015-01-17 08:54:31 -05:00
4d194da530
Merge remote-tracking branch 'origin/develop' into 0.40.24-dev
2015-01-17 08:53:49 -05:00
14aa68a27f
Merge remote-tracking branches 'lethosor/remove-embark', 'lethosor/search-menus', 'lethosor/osx-package-name', 'lethosor/expose-modstate' and 'lethosor/patch-11' into develop
2015-01-15 22:24:05 -05:00
8f4b766107
EventManager: Fix a crash bug with EQUIPMENT_CHANGE event.
2015-01-15 18:13:19 -05:00
43d7f59e0b
Bump version to 0.40.24-r0 and update xml
2015-01-14 15:09:23 -05:00
077d149d64
Expose key modifier state to C++/Lua
2015-01-11 12:51:02 -05:00
7e11ad821f
Update xml.
2015-01-05 19:33:39 -05:00
d932c76242
Fix MapCache compiling error on Windows
2015-01-05 17:28:42 -05:00
5de5d4420a
Update xml
2015-01-05 17:01:03 -05:00
182f317fcc
Merge remote-tracking branch 'lethosor/plugload-posix'
2015-01-05 16:50:43 -05:00
0cfe6a11a3
Merge remote-tracking branch 'eswald/alt-stuck'
...
Conflicts:
NEWS
2015-01-05 16:50:16 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
06029c92c2
Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9'
2015-01-05 16:40:44 -05:00
57f6a94133
Merge remote-tracking branch 'lethosor/osx-libstdc++'
...
Also update NEWS
2015-01-05 16:39:42 -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
983f096a60
Merge remote-tracking branch 'quipyowert/define-maxlayers' into 0.40.23-r1
2015-01-05 16:04:37 -05:00
9f2bdc2bdc
Disable excessive logging in Process-darwin.cpp
2015-01-05 15:58:02 -05:00
e7ee29b1e3
Clean up whitespace in Hooks-darwin.cpp
2015-01-05 15:57:34 -05:00
e0a8cc8537
Merge PlugLoad-linux.cpp and PlugLoad-darwin.cpp
2014-12-29 10:33:54 -05:00
a1c9f85a64
Repairing the stuck Alt key
...
SDL has been reporting the modifier key state incorrectly after alt-tabbing between the DF and DFHack windows.
Fixes issue #448 , though more testing is warranted.
2014-12-28 21:43:48 -07:00
3c0ac70615
Remove output from filetype()
...
Not sure how this made it in, but it's causing problems with PRINT_MODE:TEXT (not to mention filling up stdout.log)
2014-12-27 15:05:43 -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
02f2d88f35
Add option to install newer libstdc++ on OS X
...
Also include a bzipped copy of libstdc++.6.dylib
Fixes #437
Fixes #436
Fixes #460
Fixes #462
2014-12-23 10:31:00 -05:00
8e6fcac92e
persist-table bug.
2014-12-07 07:56:33 -05:00
5de3e6110a
Merge remote-tracking branch 'origin/develop' into plugin-globals
2014-12-06 17:32:44 -05:00
7072252902
fix build error on windows
...
with certain #include permutations the lack of this define would
break the build on windows as windows.h pollutes the namespace with min
and max macros that conflict with std::min and std::max.
2014-12-05 12:35:24 +01:00
bd7cb578eb
Update xml.
2014-12-04 23:31:05 -05:00
f1a863eb79
Use short plugin name
2014-12-03 23:27:52 -05:00
cac2245438
Update some plugins to use REQUIRE_GLOBAL
2014-12-03 23:26:54 -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
760acf017b
Update version to v0.40.19
2014-12-02 13:51:44 +03:00
f4e8fa2f30
Define a static variable to fix debug mode crash.
...
Fixes #404
2014-12-01 17:19:20 -08:00
83d3785735
Update xml.
2014-11-30 14:03:00 -05:00
868bc4c7fb
Update xml.
2014-11-30 11:32:46 -05:00
445640f80c
Allow commands invoked through command-prompt to access selected items/units/buildings
...
Fixes #273
2014-11-25 20:25:31 -05:00
855d27745d
Update xml.
2014-11-19 23:57:02 -05:00
a003ce7394
Print fatal errors to stdout on Linux/OS X
2014-11-17 15:12:33 -05:00
97b44d5898
persist-table tweaks, delete debug print messages
2014-11-16 20:41:11 -05:00
7560fbdb6b
library/lua/persist-table.lua: now it uses metatables to make persistent memory storage even easier.
2014-11-16 17:06:59 -05:00
798bec3ced
Merge branch 'delvintemp' into develop
2014-11-15 16:28:52 -05:00
2edc3594b8
Make it compile.
2014-11-15 16:03:36 -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
59ef4e0cc2
It is now possible to remove syndromes by SYN_CLASS.
2014-11-14 23:33:49 -05:00
5e3bf9a494
Make it compile for OSX.
2014-11-14 22:21:03 -05:00
4464d7318d
EventManager: make REPORT events only trigger for new reports, not ones that already exist in the save.
2014-11-14 22:07:48 -05:00
c85d4994cf
Preventing blank history files
2014-11-14 17:35:06 -07:00
d120e5aa84
Merge pull request #386 from ace13/develop
...
Missing includes.
2014-11-14 18:59:53 -05:00
428fe6a400
interaction-trigger tweaks
2014-11-14 18:50:19 -05:00
e2f4d3e4cb
Fix persist-table so that all data is persistently stored properly.
2014-11-14 18:49:40 -05:00
828852c36f
Made persist-table correctly clear its stuff after exiting a game.
2014-11-10 01:09:50 -05:00
593424cd6d
new Lua library for persistent maps of arbitrary degree.
2014-11-10 01:03:20 -05:00
779ac3fd50
Updated interaction-trigger to work better.
2014-11-09 18:36:21 -05:00
804aa8d398
Add missing <algorithm> include for std::min & std::max
2014-11-09 11:19:40 +01:00
0f5efb47ae
Update to 0.40.15.
2014-11-09 01:30:43 -05:00
fa401f8637
EventManager tweak.
2014-11-07 14:16:10 -05:00
dcdb6aae1b
EventManager: properly deal with frame_counter getting reset.
2014-11-06 23:44:13 -05:00
29d6bba669
Fix trackstop ambiguity complaints, update df-structures.
2014-11-02 11:55:01 -05:00
4e0ad256a5
Update XML.
2014-11-02 04:06:51 -05:00
87443035a9
Merge remote-tracking branch 'quietust/develop' into develop
...
Conflicts:
plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
4e38ec95b3
Merge pull request #354 from eswald/duplicate-onload
...
Removing duplicate world and map loading events.
2014-11-02 03:32:36 -05:00
4b7c4f8c4b
Merge pull request #356 from lethosor/disable-console
...
Allow console to be disabled by setting an environment variable
2014-11-02 03:31:35 -05:00
8769af8935
Merge branch 'develop' of https://github.com/expwnent/dfhack into develop
2014-10-31 13:34:20 -05: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
beebd624e7
Last xml update for v0.40.13
2014-10-26 13:20:45 +03:00
e41a33ddea
Allow console to be disabled by setting an environment variable
2014-10-06 17:10:33 -04:00
0471294b1e
Fix syndrome-util.
2014-10-04 21:54:07 -04:00
6c9b94bcef
Removing duplicate world and map loading events.
...
Saving a game in progress now goes through an extra viewscreen before reaching the condition that had been used to indicate whether the world was still valid, causing the core to emit bogus WORLD_LOADED, MAP_LOADED, MAP_UNLOADED, and WORLD_UNLOADED events. Adding that viewscreen to the list of loading/saving screens prevents those duplicate events from firing.
Granted, if the game_cleaner viewscreen ever gets hit in play, this fix will cause more bogus events...
2014-09-30 23:02:35 -06:00
6046d68639
Support std::fstream in data structures and add file_compressorst to xml.
...
One tricky thing is that fstream does not have operator=, so the new
file_compressorst requires a manually implemented one that skips it.
2014-09-24 22:47:04 +04:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
3678c5f649
New SDL hooks to support Stonesense updates
2014-09-16 21:16:52 -04:00
0fbc7e22ee
Merge remote-tracking branch 'lethosor/patch-4'
2014-09-16 17:21:39 -04:00
d425c2edf9
Merge remote-tracking branch 'lethosor/lua-printall-ipairs'
2014-09-16 17:08:45 -04:00
5a1d88307f
Merge remote-tracking branch 'eswald/stockpile-iterator'
2014-09-16 17:05:02 -04:00
3e882f35b3
Merge remote-tracking branch 'lethosor/global-onload'
2014-09-16 16:53:31 -04:00
8508dd6f04
Update xml.
2014-09-16 16:51:48 -04:00
328b95c1ec
Merge remote-tracking branch 'origin/develop' into global-onload
2014-09-14 11:56:07 -04:00
d21cd54648
Add '@' documentation to dfhack.lua
2014-09-14 11:50:03 -04:00
9d3af4dcb6
Close file opened in load_patch() on success
...
Fixes #327
2014-09-10 15:09:57 -04:00
fadca0aef2
Add a variant of printall() that uses ipairs
2014-09-08 20:30:22 -04:00
34d4537a11
Support for global onLoadWorld.init/onUnloadWorld.init scripts
2014-09-08 15:52:17 -04:00
c746d2a182
Update xml.
2014-09-08 15:46:25 -04:00
248e4d837b
Update xml.
2014-09-08 13:32:34 -04:00
f5039b37b8
Merge remote-tracking branch 'lethosor/osx-plug-dylib'
...
Conflicts:
NEWS
2014-09-08 13:14:28 -04:00
74e709ec19
Adding getStockpileContents to the Lua API.
2014-09-07 14:52:08 -06:00
8631da7e4e
Convenience method to collect a vector from StockpileIterator.
2014-09-07 14:10:27 -06:00
567397df85
Stockpile iterator.
...
Efficient way to operate on all items stored on a stockpile.
Doesn't currently check whether the items match the stockpile settings,
but does ignore empty containers assigned to the stockpile.
2014-09-07 13:52:07 -06:00
cf06dc3503
Update to 0.40.11, fix a few devel plugins to build again
2014-09-04 08:26:45 -05:00
9aee476c6e
Make plugins use ".plug.dylib" extension on OS X
2014-08-30 09:21:19 -04:00
1de9405ef3
Update some stuff to 0.40.10
2014-08-28 14:07:03 -05:00
45b9e1b56a
Update XML
2014-08-27 09:57:58 -05:00
deee486b81
Update Maps::SortBlockEvents to include spoors and item spatters
2014-08-20 10:51:58 -05:00
ae80ca9ec9
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-08-20 10:32:59 -05:00
5e434721ff
Remove stray BOM
2014-08-19 13:47:05 -05:00
4da333fca1
Fix Buildings module to work with ui.tax_collection.rooms change
2014-08-18 16:33:12 -05: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
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
38cc604861
Fixed bug with Lua printing buffering too long sometimes in Windows.
2014-08-15 05:54:54 -04: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
b0e1b51d2a
Change version to v0.40.08
2014-08-11 23:49:24 +04: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
0983728e14
Implement Ctrl-T, ignore unrecognized control characters
2014-08-09 21:54:47 -04:00
71236afa42
Implement readline-style Ctrl-U and Ctrl-Y
2014-08-09 21:54:47 -04:00
e71fc0455c
Fix console warnings on Linux
2014-08-09 21:54:46 -04:00
fc24d24ccc
Merge Console-linux and Console-darwin into Console-posix
2014-08-09 21:54:46 -04: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
17b19bfcdc
Update structures
2014-08-06 08:28:02 -05:00
b7c871eed7
gave t_matglossPair a few operator overloads so it can be used in std::map
2014-08-02 17:12:19 +05:30
08da62392e
Fixed a mistake where MapCache was using the wrong range for root depth.
2014-08-02 17:09:59 +05:30
2928f15629
Update fastdwarf to work properly in 0.40
2014-08-01 08:45:23 -05:00
612bcc65c8
Fix build, update XML
2014-07-29 16:43:29 -05:00
1450298484
assumed_identity -> identity
2014-07-29 16:30:22 -05:00
d6162cd189
death_info -> incident
2014-07-29 16:26:14 -05:00
0182e0c980
Fix SC_WORLD_LOADED/UNLOADED now that loading and saving takes many frames.
...
During the loading or saving screen, consider the map and world as not
loaded, because they are likely only partially valid. This fixes errors
from the log-region script.
2014-07-28 08:57:55 +04:00
1c409975de
Update the version to v0.40.05
2014-07-28 08:15:03 +04:00
4902c577b3
Fix some crashes when running without globals and update structures.
2014-07-24 23:10:37 +04:00
bc5e0f6ad6
Made DFHack buildable. Also added plant proto definitions
2014-07-23 19:57:47 +05:30
9435d8f4d9
Fix crashes caused by missing globals
2014-07-21 19:14:43 -05:00
38cdb37433
Update plant_tree_info field names
2014-07-21 14:46:51 -05:00
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
a14caa53d0
Fixed mapcache reading plants in for 0.40.01 onwards.
2014-07-20 16:41:20 +05:30
a8f810cc3b
Lots of tweaks.
2014-07-09 06:21:52 -04:00
0a16bc2e12
Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
...
Conflicts:
plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
3c06f3bada
Allowed per-save script folders.
2014-07-07 08:50:40 -04:00
5404b69476
Tweak repeat.lua.
2014-07-03 20:32:15 -04:00
e28a42b848
Fixed a problem with syndromeUtil, renamed to syndrome-util, and made add-syndrome use proper conventions.
2014-07-03 15:18:00 -04:00
649dcd1413
EventManager tweak: make it report the correct invasion id.
2014-07-03 14:37:13 -04:00
376bcc6020
create-item script
2014-07-03 12:40:07 -04:00
2fb8faf3e6
Added Items::createItem function.
2014-07-03 10:39:20 -04:00
d8c3a05f42
Made EQUIPMENT_CHANGE event trigger for new units.
2014-07-03 08:10:12 -04:00
9d2c7a1abc
Tweak to repeatUtil.
2014-07-03 08:09:47 -04:00
d048335a80
Tweaked item-trigger.
2014-07-03 06:01:58 -04:00
81c87d0921
EventManager: INTERACTION event for unit interactions.
2014-07-03 04:55:12 -04:00
e04ab11659
Merge branch 'develop' of github.com:DFHack/dfhack into develop
...
Conflicts:
library/xml
plugins/stonesense
2014-07-02 23:18:55 +05:30
516121d4f8
Fixed the getprofession behavior in adventure mode. Now it checks for the current adventurer's race instead of the fortress race.
2014-07-02 23:07:24 +05:30
8f43b97284
EventManager tweaks.
2014-07-01 09:02:20 -04:00
4ac32cfd74
EventManager: made UNIT_ATTACK trigger for severed body parts.
2014-07-01 08:58:48 -04:00
d765de4546
Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization
2014-07-01 02:05:14 -04:00
1c0ae94539
processArgs now detects duplicate args.
2014-07-01 00:57:24 -04:00
2ed7960f96
Tweaked utils.lua::processArgs to allow specification of a table of acceptable argument names.
2014-07-01 00:55:52 -04:00
c3c025c034
Added Lua subroutine for standardized argument processing.
2014-06-30 02:19:50 -04:00
961d033ade
EventManager: unload event for convenience.
2014-06-29 10:03:55 -04:00
8a3050a1c0
Notify the user when dfhack.init is missing, and fall back to example.
2014-06-28 17:08:14 +04:00
3744fc3575
Update structures
2014-06-28 16:59:09 +04:00
a62b15ccd2
Revert "Allowed dfhack.timeout tick events to be queued before a world is loaded."
...
This reverts commit ecd75e9b3e
2014-06-28 03:06:19 -04:00
f12aa3665b
Removed the temporary lua events because EventManager does them better.
2014-06-28 02:46:08 -04:00
ceae634954
Squashed EventManager commented out thing I don't need anymore.
2014-06-28 02:41:00 -04:00
8e7e87ac73
Added UNIT_ATTACK event to EventManager and exposed it to Lua.
2014-06-28 02:31:34 -04:00
c635632ae7
EventManager.cpp: fix indentation.
2014-06-27 22:09:01 -04:00
2443568998
Merge branch 'develop' into scriptOrganization
2014-06-27 22:03:09 -04:00
830b39e13b
Non-silent version of Lua's run_command
2014-06-27 21:58:36 -04:00
fc7ac9b47f
Update XML and sync plugin
2014-06-27 13:01:46 -05:00
ecd75e9b3e
Allowed dfhack.timeout tick events to be queued before a world is loaded.
2014-06-27 06:49:29 -04:00
0db0244d08
Added add-syndrome script to modtools and fixed syndromeUtil so it actually works. This should make it so that event hooks only have to be able to run scripts instead of run scripts and add syndromes.
2014-06-27 05:47:52 -04:00
187ce3c58b
Fixed the organization of my new lua modules. They now go in library/lua instead of where plugin lua modules go. Updated scripts accordingly.
2014-06-27 02:43:05 -04:00
17ed08cfe5
Fix the OSX image base address so that binary patches work correctly.
2014-06-26 18:28:50 +04:00
6f162a4e72
Verify that mkmodule is called with the correct module name.
2014-06-26 18:11:05 +04:00
9cb913b121
Update structures
2014-06-26 17:24:11 +04:00
7313c18a2a
EventManager/eventful: added ON_REPORT event and exposed it to Lua.
2014-06-23 09:15:46 -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
036aae060b
Merge lethosor stuff. For some reason, git's auto merge message didn't happen because of git-stash shenanigans. Oh well.
2014-06-19 22:58:17 -04:00
ec64a787c6
Use _getcwd on Windows
2014-06-19 22:34:40 -04:00
73fdb8b125
Fix Windows compile-time error
2014-06-19 21:24:16 -04:00
ef69522d93
Merge branch 'develop' into filesystem-module-pr
2014-06-18 15:45:42 -04:00
2db73a407d
Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop
2014-06-17 10:39:26 +04:00
32d8efad54
Merge branch 'lua-runcommand' of git://github.com/lethosor/dfhack into develop
2014-06-17 10:27:50 +04:00
fb922fab37
Handle invalid arguments to runCommand
2014-06-16 11:40:26 -04:00
d538e13450
Allow runCommand arguments to be passed as a table internally
2014-06-16 11:16:35 -04:00
b029690550
Update structures
2014-06-16 13:48:58 +04:00
6fa478de22
Filesystem module
...
Implements a handful of filesystem-related functions (e.g. chdir, mkdir)
in C++ and Lua.
2014-06-15 22:38:17 -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
e0808c8c96
Use squad::find instead of indexing the vector
2014-06-10 22:38:32 -04:00
2a01259192
Fix runCommand crash, return output and result
2014-06-10 21:38:21 -04:00
143b1e3469
Lua runCommand improvements
...
* Return error codes (e.g. CR_FAILURE) when a command fails instead of output
* Make dfhack.runCommand() take a list of arguments as well
2014-06-10 13:41:01 -04:00
e4876ed752
Merge branch 'develop' into lua-runcommand
2014-06-10 13:12:07 -04:00
08b4279c4d
Document better how to access fields of the interposed class.
2014-06-10 13:10:10 +04:00
0be30b807c
Merge branch 'console-move-word' of git://github.com/lethosor/dfhack into develop
2014-06-10 12:53:43 +04:00
0e3fb79f0e
Update structures
2014-06-10 12:52:17 +04:00
bdcc00f6f7
Util method (in the Units class) to get a unit squad name (the translated name, or alias if set)
2014-06-09 21:51:52 -04:00
91a93a00d2
Add dfhack.run_command (Lua)
...
Simplified version of runCommand
2014-06-07 20:31:20 -04:00
2242d42c9c
Implement runCommand in Lua API
2014-06-07 20:15:49 -04: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
0a0358a8c1
Update structures
2014-06-03 12:59:55 +04:00
dedd7e4185
Adds new console methods and commands to hide/show console. Only on windows (for now?)
2014-05-26 18:42:04 +03:00
bdca1ee709
Linux: Extended back/forward word sequences
2014-05-26 10:03:28 -04:00
b14ef95dec
Merge branch 'console-move-word' into console-move-word-linux
2014-05-26 10:01:04 -04:00
d320fe71d1
Implement extended arrow key sequences
2014-05-25 23:39:34 -04:00
58b9c02ce5
Migrate esc-b/f sequences to Linux
2014-05-25 22:10:40 -04:00
1fcaac9d2e
OS X Console: Implement back/forward one word escape sequences
2014-05-25 21:52:16 -04:00
e483e7439f
Fix problems with NONE for item types and subtypes
2014-05-22 08:18:01 -05:00
fe93aba612
Update structures
2014-05-11 13:36:36 +04: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
98325757e2
Fix signed-unsigned mismatch warnings in the new item value code.
...
Unsigned comparison allows catching negatives in the same check too.
Also, it didn't check the values in getValue.
2014-04-30 20:44:22 +04:00
0f4684f29d
Add Items::getItemBaseValue and Items::getValue, available from Lua
2014-04-25 11:04:21 -05:00
57fbb1004b
Assorted cleanup
2014-04-23 08:23:34 -05:00
c3d45c3a1e
Add Job::getName(job *), also available from Lua
2014-04-23 08:03:10 -05:00
1d1ede279f
Update structures
2014-04-21 09:52:07 +04:00
6bef167f83
Add a couple of useful scripts and fix two missing NULL checks.
...
- A script to unstick jobs trying to build walls from the same tile.
- A devel script for viewing the path a unit is currently following.
2014-04-21 09:24:05 +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
7844907204
Add new API functions for creating announcements and combat reports.
...
Allow specifying the announcement flags directly, and adding unit
combat reports. Also, make announcement functions write the message
to the game log.
2014-04-15 19:50:23 +04:00
b56c3a95a6
Fix some signed/unsigned mismatch warnings and whitespace in Job module.
2014-04-15 19:50:23 +04:00
22dab5d807
Update XML, fix several scripts that were broken by field name changes
2014-04-14 12:30:34 -05:00
ddd56d8ea6
Update the structures.
2014-04-12 17:21:35 +04:00
7aecffe0cd
Update structures and fix broken things.
2014-04-04 22:34:39 +04:00
788bc55096
Fix a mistake in the lua resize() method of BitArray.
2014-04-04 22:33:05 +04:00
a09e132107
Support using multiple lua init scripts per save.
...
This should make it easier to add and remove init script code by
automated means, or install multiple mods that need such code.
2014-03-31 16:00:55 +04:00
e620ae765c
Add missing import/export info for MersenneRNG::unitvector<>
2014-03-25 13:30:21 -05:00
ec14b2d1e9
Merge remote-tracking branch 'warmist/dev-modmanager' into develop
2014-03-24 20:07:02 +04:00
a01939fce6
Sync structures.
2014-03-24 19:45:27 +04:00
b030548156
Added directory listing to lua api (internal category).
...
added mod manager and updated readme/news
2014-03-04 18:01:44 +02:00
36b09c950d
Actually export to lua a few functions that are documented as available.
2014-02-28 09:41:04 +04:00
72eb366997
Merge changes, also fix Windows build (missing header)
2014-02-27 15:58:15 -06: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
7bdb687e4a
Support calling a lua function via a protobuf request.
...
Previously the only way to call lua code was to call scripts
and parse their output to the stream, which is cumbersome.
2014-02-10 20:09:06 +04:00
8800cf6f40
Export functions for converting between UTF-8 and CP437 to lua.
2014-02-10 18:54:52 +04:00
387cc983f9
Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack
2014-02-02 23:50:21 +01:00
7df9957941
dfhack-run: prevent duplicate "not a recognized command" error message
2014-01-27 15:36:34 +01:00
6ad8d128ba
use non-interactive console when calling dfhack.init in TEXT mode
2014-01-27 15:36:25 +01:00
6b6164c099
call dfhack.init even in TEXT mode
2014-01-27 14:51:22 +01:00
f0eeba93ce
DFHack compiles under OS X now.
2014-01-25 03:21:56 -05:00
ce33973f0f
Merge branch 'master' of github.com/quietust/dfhack
2013-12-24 14:07:08 +01:00
53bd112515
Hide fake historical figures from legends xml export.
2013-11-07 12:27:53 +04:00
b2819ea869
Fix wrong argument iteration bounds in dfhack.matinfo.find().
2013-11-07 11:40:26 +04:00
04dce1aa7f
MaterialInfo: fix decoding for COAL subtypes
2013-11-05 00:31:32 +01:00
15c2d99a3e
Update xml.
2013-10-25 14:23:55 -04:00
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
ce1bb1e95b
Merge remote-tracking branch 'putnam/master' into 0.34.11-r4
2013-10-20 23:27:12 -04:00
4dbcee9560
EventManager: be smarter about removing things while iterating.
2013-10-20 23:16:21 -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
3594dc2eb8
EventManager: fixed the TICK event, and a few tweaks.
...
- redo tick event management to work with world->frame_counter
- the freq of a TICK EventHandler is now ignored
- unregistering for an individual TICK event is still broken
- you would have to know the modified freq to even begin removing it
- it is only removed from handleres[TICK], not from tickQueue
- redo unregisterAll to be more efficient
- use the map loaded/unloaded events instead of world loaded/unloaded for initializing/clearing event monitoring data
- get rid of silly unsigned variables
2013-10-20 21:48:28 -04:00
9bf004d07f
Several EventManager fixes and improvements.
...
- handle loading and unloading of saves better
- made sure it never triggers bogus events on loading a save
- plugins should now handle loading themselves with onStateChange
- special case to make Buildings module keep track of all buildings correctly on load
- fixed syndrome detection
- was broken because of the switch from ticks-since-the-dawn-of-time to world->frame_counter
- added lastSyndromeTime global
- fixed possible off by one error when looking for new created items
- got rid of the unread lastTick global
- const'ed the function pointer array of eventManagers
2013-10-20 20:12:42 -04:00
f69fd1d528
EventManager: prevent eventspam just after loading a save.
2013-10-20 17:39:54 -04:00
4a32aff6a3
Update script.lua
2013-10-20 13:58:15 -07:00
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
d78a111f02
EventManager: Fixed the death event, fixed another problem with construction event, and made EventManager use world->frame_counter for scheduling event checking in order to make it work in arena mode.
2013-10-20 14:41:39 -04: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
1422197533
Merge remote-tracking branch 'adeon/for-dfhack' into 0.34.11-r4
2013-10-20 10:45:00 -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
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
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
bed1e00a6e
Use a cast instead of floor in perlin noise for performance.
2013-10-10 12:15:50 +04:00
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
63d8267606
Decode ice under constructions if possible, but never write it out.
2013-10-10 12:15:50 +04:00
f36041f6bd
Implement a MapCache api for writing base layer tiles of arbitrary stone.
...
Precompute some tables in TileTypes for extremely efficient
conversion between tiles of most important material types.
2013-10-10 12:15:50 +04:00
68b6e10b2c
Implement writing veins tile by tile through MapCache.
...
Unlike changevein, which changes the material in an existing vein
object, with this feature you can set the material for individual
tiles, and the cache will write it out as vein objects.
The array inside the cache data is changed from layer material to
vein material, because layer material is easy to compute.
2013-10-08 18:17:36 +04:00
9442e8ea1f
Make biome information more explicit in MapCache.
2013-10-07 16:58:10 +04:00
ea36233dff
Split MapCache code from Maps.cpp
2013-10-07 16:58:10 +04:00
84033bd586
ruby: dont list ruby scripts when ruby plugin is disabled
2013-10-07 14:32:47 +02:00
33469f5bb2
Use a better hash function in the Perlin noise generator.
2013-10-02 18:55:41 +04:00
e175efa689
Implement a template-based classical Perlin noise generator.
...
The mask argument of the Impl template is there because apparently
an inner template cannot be fully specialized, so there needs to be
some argument besides i.
2013-10-01 18:58:04 +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
9e81d27cd1
Implement the same random generator as DF uses for DFHack.
2013-09-30 19:46:39 +04:00
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
11635caeb8
Add makeown.lua.
2013-08-31 16:15:54 -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
506a60709e
Add SDL_PushEvent() to one of the hooked SDL functions.
...
This is needed by Dfterm3 plugin.
2013-08-20 21:41:08 +03:00
df2e04db26
Update xml definitions.
2013-08-16 18:25:16 +04:00
6f5c03b912
core: generate SC_WORLD_LOADED for arena too
2013-07-07 23:36:22 +02:00
ba73de5e35
EventManager: use units.all instead of units.active.
2013-06-20 21:34:32 -04:00
49409d4630
Follow xml changes.
2013-06-11 16:10:42 +04:00
1b260fe549
Made the per save onLoad and onUnload script use the right separator character for different operating systems.
2013-06-10 15:55:54 -04:00
57c42e3927
Maps.ensureTileBlock: fixed temperature issues, and properly added blocks to the world.map.map_blocks vector to prevent weird glitches.
2013-06-10 15:43:14 -04:00
9f6638432f
When a save is loaded/unloaded, the script at raw/onLoad.init or raw/onUnload.init is run. They use the same format as dfhack.init.
2013-06-10 00:45:46 -04:00
08114cf574
diggingInvaders: more fixes. Still a few issues with ramps probably.
2013-05-31 20:39:43 -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
aed5f4178f
Update xml.
2013-05-30 20:06:06 -04:00
e0b27a6873
Update xml.
2013-05-28 19:55:26 -04:00
3403146461
Merge remote-tracking branch 'peterix/master'
...
Conflicts:
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
638b2e974c
EventManager: cleaned up manageEvents considerably, using a function pointer array.
2013-05-25 12:19:54 -04:00
bcaaa72387
EventManager should use a CoreSuspender just in case.
2013-05-25 11:50:43 -04:00
b44cd86dc9
EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.
2013-05-25 09:44:17 -04:00
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
e5fd918b0c
job: unk2 -> subtype
2013-05-05 03:55:08 +02:00
d7145d9b69
Fix bug #188 , eggy hook
2013-04-24 17:50:34 +02:00
6a907e3584
Fix issue #195 - off by one error in building dimensions
2013-04-24 17:41:25 +02:00
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
b4092f62e6
New module: Once. Intended to help prevent debug error message spam.
2013-03-23 22:38:33 -04:00
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
d78a5593cc
Minor fix to Process methods
2013-03-14 13:32:39 -04:00
27f23746bd
Do not use autocompletion to second-guess the user.
2013-03-14 06:43:38 +01:00
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
7cbd201f31
Nuke the third exit(1) and change building caching code to make more sense.
2013-02-14 13:13:25 +04:00
a8f5e54e37
Sync submodules
2013-02-14 09:53:14 +01:00
148a37b2e4
Sync structures
2013-02-13 13:55:28 -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
9ca435544e
Nuke unsafe behavior in Buildings::findAtTile from orbit.
2013-02-13 15:03:15 +04:00
a17760af4f
Communicate the Plugin pointer to the plugin in a decent sort of way.
2013-02-13 14:45:24 +04:00
f90737e274
Add more comments to the vmethod interpose implementation.
2013-02-10 15:26:48 +04:00
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
e06b6904f1
Small fix to sync dfhack with the structures.
2013-01-15 23:41:43 +01:00
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
3ffbef2396
Merge branch 'canStepBetween' into recent
2013-01-05 18:10:29 -05:00
f8abd5c595
StepBetween: renamed stuff back to the way it was. Thought I had already done that.
2013-01-05 18:09:50 -05:00
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
8e90ca6b41
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 22:47:45 -05:00
ec03d567d2
EventManager: use WORLD_LOADED instead of MAP_LOADED.
2013-01-03 22:47:27 -05:00
f145f8d528
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 19:32:12 -05:00
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
9e74ae58f2
EventManager: Fixed a problem with deregistering event frequencies.
2013-01-03 19:07:05 -05:00
84b8fae326
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 15:53:06 -05:00
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
a0d2f262b0
Update submodules.
2013-01-02 21:38:53 -05:00
5865579b23
EventManager: got rid of print statement.
2013-01-02 19:26:37 -05:00
6d2773856a
EventManager: fixed a few things.
2013-01-02 19:23:40 -05:00
4e4e382b8f
EventManager: added syndrome event.
2013-01-02 18:30:15 -05:00
144e0b4dcb
Digging Invaders: merged eventManager and recent.
2013-01-02 11:26:30 -05:00
c3b2ae2137
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
2013-01-02 11:07:56 -05:00
fa78d6ccfc
Merge branch 'recent' into eventManager-unstable
...
Conflicts:
library/modules/Job.cpp
2013-01-02 03:16:45 -05:00
4e99841862
EventManager: made Buildings module keep track of buildings so that it
...
can do findAtTile in constant time.
2013-01-01 22:22:31 -05:00
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
bb3a491d68
Implement a per-save lua init script.
2012-12-21 14:00:50 +04:00
ee4f37ff72
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-19 20:31:17 -05:00
7972902c81
stepBetween: named a few things better, and fixed a lot.
2012-12-19 20:30:37 -05:00
a93c0223a2
EventManager: unstable. Temp commit.
2012-12-18 20:28:30 -05:00
555c754636
EventManager: added construction and building events.
2012-12-18 18:34:38 -05:00
515eb3b060
Reverted the silly changes to Buildings module that didn't work anyway.
2012-12-17 17:38:47 -05:00
3fde504ae2
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-17 00:25:31 -05:00
22837af8d7
canWalkBetween: fixed bug involving ramps.
2012-12-17 00:25:14 -05:00
d79583a2c9
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-16 23:39:36 -05:00
1a6a09281b
canWalkBetween: forgot a case with ramps.
2012-12-16 23:37:15 -05:00
d2be8f18e1
canWalkBetween: forgot a case with stairs.
2012-12-16 23:30:35 -05:00
01e5e93825
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
2012-12-16 23:26:50 -05:00
131d19e4cf
Merge branch 'eventManager' into diggingInvaders
2012-12-16 16:43:58 -05:00
8a242b3c0d
Merge branch 'master' into diggingInvaders
2012-12-16 16:34:45 -05:00
78aab90f3a
EventManager: whitespace.
2012-12-16 16:27:08 -05:00
3951d4d204
EventManager: made it safe to register/unregister while events are being triggered.
2012-12-16 15:39:39 -05:00
d4d8e69556
EventManager: Allowed absolute time registration.
2012-12-15 18:08:59 -05:00
935058f0a5
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
2012-12-15 17:43:41 -05:00
86e002f3ff
EventManager: added item creation event.
2012-12-15 16:49:13 -05:00
b0314755e0
EventManager: added unit death event.
2012-12-15 14:40:11 -05:00
155a4d044c
EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.
2012-12-14 23:29:28 -05:00
cf619a519e
EventManager: made event handlers unregister when plugins are unloaded. Also changed PluginManager so that plugins can call core.getPluginManager() during plugin_init.
2012-12-14 22:14:38 -05:00
747723187f
EventManager: first draft.
2012-12-14 21:05:38 -05:00
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
ff4278d04e
Removed debug spam, added support for "HAS_MATERIAL_REACTION_PRODUCT" type reactions.
2012-12-09 23:07:13 +02:00
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
2018ac1d17
Sync structures
2012-12-08 21:25:16 -06:00
4f5fdebbe9
furnaces added and custom reactions.
2012-12-09 00:53:03 +02:00
a0e671d75d
Make rename unit reset the name if it becomes completely empty.
2012-12-08 20:39:57 +04:00
a1eeb02a1b
autocomplete command names from the console
2012-12-07 01:34:04 +01:00
ebc2625d97
ditch the unused Vegetation module
2012-12-06 23:47:25 +01:00
3bce3838af
Advfort now supports workshops and siege weapons >:)
2012-12-03 21:49:17 +02:00
3953112eb9
dump Vegetation::t_plant, fix plant.is_burning
2012-12-03 19:03:07 +01:00
9703d3fd8f
Detect mouse press events for lua.
2012-12-02 14:43:23 +04:00
58239e97ed
Implement the history graph in the workflow status screen.
2012-12-01 16:50:03 +04:00
021d089709
sync structures
2012-11-30 20:25:19 -06:00
0bfe006016
Try to reimplement the inventory monitor by falconne in lua.
...
For no other reason than to provide a complete example of lua
interface for a native plugin :)
TODO: paint the graph in the right pane.
2012-11-30 19:10:17 +04:00
471d15ba4c
New building selection dialog.
2012-11-29 20:49:16 +02:00
5ea26d9cae
Only show the advanced new constraint dialog on Shift-Enter.
...
Upon reflection it is a bit too scary to be always shown.
2012-11-29 16:27:51 +04:00
94e6690586
Don't complain about fake input tokens in simulateInput.
2012-11-29 13:37:16 +04:00
bfc11cf946
Add persistent history of per-constraint item counts in workflow.
...
This will be needed for properly merging or integrating the status
screen by falconne. The history is maintained as a circular buffer
of up to 28 entries, and persists in save files.
2012-11-28 19:25:01 +04:00
e3eb325d36
Minimize references to gps->dimx/dimy
2012-11-23 19:18:56 -06:00
e7905a5cff
Add docs for the automaterial plugin, and use the new Painter class.
2012-11-22 19:38:45 +04:00
bb3c5c02c1
Adjustments for MSVC compatibility
2012-11-20 09:32:04 -06:00
3b2b77c693
sync structures
2012-11-20 08:22:21 -06:00
767c1b9368
Duplicate the lua Painter class in C++.
2012-11-19 18:11:26 +04:00
2953e4c386
Implement a dialog to specify a workflow constraint with all features.
2012-11-17 20:32:39 +04:00
0b568942f4
Follow changes in the xml defs.
2012-11-17 16:43:29 +04:00
1ab48aa2de
Merge https://github.com/ab9rf/dfhack
2012-11-16 21:15:38 -06:00
3f2e583746
Naming consistency
2012-11-16 15:35:34 -06:00
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
1379891270
Merge remote-tracking branch 'jjyg/master'
2012-11-16 13:50:59 -06:00
648abee285
EXECUTE -> EXEC and add parenthesis to make MSVC whine less.
2012-11-16 13:50:38 -06:00
2b087a7081
fix windows typos
2012-11-16 20:49:30 +01:00
a6fba3daf2
const void* -> void* in memDealloc and memProtect for Windows too
2012-11-16 13:44:38 -06:00
d506dd7137
Add a tweak to speed up melee squad training.
2012-11-16 22:51:07 +04:00
2401be1b3b
Add an api function to retrieve unit skill experience.
2012-11-16 22:48:49 +04:00
72912edf58
Ensure AddPersistentData won't create duplicate ids.
...
If anything messes around with the histfig vector between calls.
2012-11-16 18:45:51 +04:00
dd89baf6f8
add raw mmap/mprotect access
2012-11-13 01:41:53 +01:00
bbe94c006f
Update for temperaturest
2012-11-12 11:54:21 -06:00
b4dcc7e7ad
Add more native api functions for finding general and specific refs.
2012-11-12 19:17:32 +04:00
a99d47ee7a
Remove UTF-8 BOMs added by notepad
2012-11-12 08:38:29 -06:00
766aca4911
Rename general_ref vectors for consistency
2012-11-12 08:27:58 -06:00
6cf85b4318
Abstract the back-end from the binpatch script, and use in gui/assign-rack.
2012-11-12 12:26:31 +04:00
012d22fa4f
Add a script for manipulating binary patches at runtime, and some patches.
2012-11-11 17:24:13 +04:00
f657c20a1d
Add an internal API for converting between file and memory offsets.
2012-11-11 15:56:31 +04:00
0e4df55364
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-11 12:46:55 +02:00
56ef33ea0e
Support building steam engines on top of brooks without any down stairs.
2012-11-10 17:33:05 +04:00
eb936c4ce0
Support milking and shearing in workflow.
2012-11-10 17:06:54 +04:00
0c70a448d0
Update submodules
2012-11-07 23:06:02 +01:00
ff982dcf73
Fix representation and parsing of built-in materials.
...
The trick is to support both FOO and FOO:NONE for all of them,
including INORGANIC[:NONE]. Otherwise the workflow gui scripts
have problems.
2012-11-07 13:31:36 +04:00
bd8c59462c
Add documentation for the core lua gui library stuff.
2012-11-04 17:06:32 +04:00
9598316855
Add a native pen object for lua with a more checked behavior.
2012-11-03 20:06:33 +04:00
6be65690f7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-11-02 20:29:27 +02:00
05b73af9bb
Extend fix-armory with support for storing ammo in barracks.
2012-10-30 23:20:34 +04:00
3ff5d38a5c
Add a few utility functions to the main library.
2012-10-30 12:40:26 +04:00
dc2805b1f3
Link the renderer vtable from libgraphics on linux.
2012-10-30 10:38:32 +04:00
ed4904fb66
Add a tweak that makes dwarves haul equipment from stockpiles to the armory.
2012-10-28 21:13:28 +04:00
4aa1999347
Add a lua api function for patching multiple individual bytes.
2012-10-28 11:50:28 +04:00
fdaa2a35a1
Fix name ambiguity in MemoryPatcher constructor.
2012-10-28 09:34:50 +04:00
92a3277777
Add a MemoryPatcher class as an optimization of scattered patchMemory.
...
This class can cache the set of memory regions during its lifetime,
and make them writable only once. This avoids e.g. re-reading
/proc/*/maps once for every modified vtable in interpose code.
2012-10-27 21:58:40 +04:00
e353f5f03e
Add a script to complement the weapon rack binary patch.
2012-10-27 20:16:27 +04:00
34f33a8c91
Fix the error message produced by binpatch when a mismatch is detected.
2012-10-27 15:35:11 +04:00
4c2c6a1911
Fix handling of Collect Webs jobs in workflow.
2012-10-26 23:53:18 +04:00
b976e01b8c
Follow the change in the base-type of job_skill.
2012-10-26 20:29:21 +04:00
1f994295b8
Consider assigned vehicles in use, and tweak text color rendering.
2012-10-25 13:20:41 +04:00
8eebfa007c
Tweak the workflow gui script to make the UI operate smoother.
2012-10-25 12:15:18 +04:00
a1dd31aab3
Tweak the mechanics for showing and rendering lua screens.
...
- Place new screens below any dismissed ones on top.
- When asked to render a dismissed lua screen, call render() on its
parent to avoid producing a black screen frame when unlucky.
2012-10-25 12:09:39 +04:00
59ec9b304e
Implement adding workflow constraints from gui/workflow.
2012-10-24 21:49:30 +04:00
616c57257d
Support changing the constraint ranges from the workflow gui script.
...
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
7b67df4b4e
Merge remote-tracking branch 'q-github/master'
2012-10-24 16:49:12 +04:00
09f8e8e419
Start working on gui for workflow.
2012-10-23 21:42:03 +04:00
27c7dfde4f
ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages
2012-10-23 12:14:21 -05:00
cfbdf47f6e
follow rename Carried->Hauled in df-structures unit inventory mode
2012-10-22 19:37:12 +02:00
46938625fd
Pass the hotkey keys to dwarfmode from overlays, and fix gui/workshop-job.
2012-10-21 21:45:51 +04:00
67674a7676
Merge remote-tracking branch 'jjyg/master'
2012-10-21 11:12:32 +04:00
1f7a01d685
follow rename unit.military.squad_index to squad_id in df-structures
2012-10-20 22:35:39 +02:00
dee0c97584
Add a gui script for viewing and changing job_item properties.
2012-10-20 21:57:36 +04:00
fbba4caab2
Suppress checking the cookable material flag if the item is a container.
2012-10-20 21:16:00 +04:00
0c9f1e0af4
Check the item type against job_item_vector_id when matching to jobs.
...
This will prevent setting an invalid item type via the job command.
2012-10-20 21:01:22 +04:00
795961bfc4
Fix the treatment of non_economic in Materials/Items modules.
...
non_economic == !(is boulder && is inorganic && is economic)
2012-10-20 20:31:45 +04:00
5388ad475f
Fix a bug in lua wrapper caused by the recent pairs() addition.
...
It inadvertently removed all functions like df.new from the df table.
2012-10-20 20:14:50 +04:00
2b1d856214
Add a few utility functions to the lua api.
2012-10-20 17:06:33 +04:00
687dc7105f
Merge remote-tracking branch 'kmartin/master'
2012-10-20 15:39:20 +04:00
da92fb9a1c
Start of dfusion module. Fixed small error in memscan.lua and start of custom embark command.
2012-10-17 21:43:44 +03:00
1e2570f4cb
Add an extremely simple item selection dialog by wrapping ListBox.
2012-10-17 21:42:06 +04:00
2bbd00a8ec
Add pairs and ipairs support for objects in df tree.
2012-10-17 20:58:37 +04:00
2d4935bc17
Add lua API functions for verifying item and material vs job_item flags.
2012-10-17 19:16:18 +04:00
4f7895f571
Support restricting the set of materials presented in the dialog.
2012-10-17 18:29:15 +04:00
0046b093f7
Link visibility and event handling order.
...
- Hidden widgets don't receive events.
- Children handle events in top to bottom order.
2012-10-17 11:49:11 +04:00
ad4f9908fb
Extract a generic filtered list widget from the materials dialog.
2012-10-17 10:41:50 +04:00
b14e4e97f5
Natively support entry icons in the List widget.
2012-10-17 09:41:48 +04:00
8fd1dd04bb
Display dfhack version number at end of baseline 'help' message.
2012-10-16 19:27:48 -05:00
023dc82564
Implement a material selection dialog.
2012-10-16 18:33:00 +04:00
d336abfd97
Add label and list widgets, and switch stock dialogs to them.
2012-10-16 14:18:35 +04:00
abfe2754fb
Start implementing common widgets for lua screens.
2012-10-15 20:03:18 +04:00
33bd8103de
Extract an abstract View superclass from Screen to handle widget trees.
2012-10-15 15:30:00 +04:00
2865e1373a
Experimental API for associating tile bitmasks with persistent data.
...
Use block_square_event_world_constructionst objects with the same
bogus negative id as the matching historical figure object.
2012-10-11 17:34:34 +04:00
5206236b01
Look through missing intermediate bases when interposing subclasses.
2012-10-11 15:10:19 +04:00
010417c812
Compute detailed focus string for the hauling menu.
2012-10-11 12:36:17 +04:00
7224c8746a
Print the new md5 hash after modification in binpatch.
2012-10-08 16:47:52 +04:00
28f0fed0aa
Redo the way binpatch backs up, so as not to lose the executable perms.
2012-10-08 16:22:35 +04:00
408f0cb06e
Add a small stand-alone utility for managing binary patches.
2012-10-08 12:10:02 +04:00
49476818c4
Dfusion rebuild start (lua script side plugins)
2012-10-07 20:45:14 +03:00
923ea3f4b0
Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers)
2012-10-07 20:44:18 +03:00
459c69046b
Dissolve the World module class into a namespace.
...
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
5396a67465
Some tweaking and edited NEWS.
2012-10-06 12:40:46 +04:00
9f687f64a4
Fix build.
2012-10-03 12:58:05 +04:00
33aead34b4
Implement a more automated search mode based on keys for some globals.
2012-10-02 19:53:16 +04:00
bd3d3061ae
Add a module that wraps the dialogs as "blocking" coroutine functions.
2012-10-02 18:01:28 +04:00
abf503fcdc
Fix the ListBox dialog to behave in a more consistent way.
2012-10-02 16:45:17 +04:00
9d5adf1b2f
Update the lua screens to use the new key display string API function.
2012-10-02 15:25:59 +04:00
7440e80e6c
Add an API function to retrieve interface key bindings for display.
2012-10-02 13:49:31 +04:00
ba5b8638a9
Merge https://github.com/jjyg/dfhack
...
Conflicts:
fixTexts.sh
2012-09-30 23:29:13 +02:00
8812238bf6
Update license, add contributors file, bump release number
2012-09-30 04:03:37 +02:00
b1ad92e310
Track structures
2012-09-30 02:52:30 +02:00
62cde96724
Add a script to reclassify 'individual choice' weapons based on unit skill.
2012-09-29 17:21:49 +04:00
48da06ec37
Add an API function for reading the nominal skill level.
2012-09-29 15:18:04 +04:00
eaddd0e646
Try shutting up a few random warnings.
2012-09-29 12:47:41 +04:00
53c6ee4673
Track structures and stonesense
2012-09-28 21:57:12 +02:00
164c61b638
Forbid stuff from bins in siege-engine, if forbid ammo standing order set.
2012-09-27 10:43:42 +04:00
2e5f3c4620
Merge remote-tracking branch 'jjyg/master'
2012-09-27 10:36:14 +04:00
7cc29250f8
fix for updated viewlist_petst
2012-09-26 18:22:07 +02:00
627f036830
Implement a special command parsing mode with one verbatim argument.
...
Intended for script expressions, e.g. rb_eval.
2012-09-24 19:13:33 +04:00
8e25158811
Sync up df-structures
2012-09-23 19:40:04 -05:00
6f67a71e00
Search for cur_season and cur_season_tick in devel/find-offsets.
2012-09-22 14:52:08 +04:00
038d62367e
Implement explicit hook priority in vmethod interpose.
...
This resolves a getName order conflict between power-meter and rename.
2012-09-22 13:14:06 +04:00
82dc1445cf
Support the Room list in getSelectedBuilding.
2012-09-20 11:55:53 +04:00
c39a337223
Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.
2012-09-20 11:11:20 +04:00
7ce772ae0e
Add an API function that returns the selected building.
2012-09-20 10:41:03 +04:00
a02a120e2d
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
library/xml
plugins/CMakeLists.txt
2012-09-18 23:46:16 +03:00
a4799a384b
Catch C++ exceptions in dfhack.buildings.setSize
2012-09-18 20:45:59 +04:00
57b72831ca
Overhaul the concept of lua 'class' initialization yet again.
2012-09-18 20:30:25 +04:00
d70a79deb9
Follow changes in XML defs.
2012-09-18 13:11:11 +04:00
be928a9dc5
Fix a data structure integrity bug in VMethodInterposeLinkBase.
...
This causes assertion failure and abort later on.
2012-09-18 10:40:14 +04:00
36e44c682c
Add a plugin implementing 'add spatter to item' reactions.
2012-09-17 21:15:51 +04:00
c1e20c6f05
Follow changes to structures.
2012-09-17 12:47:18 +04:00
811c096c0e
Vaporize liquids from barrels, and destroy bin contents in siege engine.
2012-09-14 20:22:49 +04:00
24772f4dbc
Add an api function for destroying items.
2012-09-14 18:49:02 +04:00
d22591e240
Fix a file descriptor leak and a crash in linux getMemRanges.
2012-09-14 12:35:55 +04:00
1d8c9a6a5f
Merge https://github.com/danaris/dfhack
2012-09-13 14:30:44 -05:00
24b93ea61f
Library location fixing script
2012-09-13 14:58:52 -04:00
46321a6a01
Rename world_data.unk_204 to feature_map
2012-09-12 13:41:59 -05:00
f06f9af6b8
Throw items from bins around in siege engine, like minecarts do.
2012-09-12 20:57:25 +04:00
7c71aeab5f
Add function for making item projectiles.
2012-09-12 18:17:42 +04:00
3a075f4bc7
Trivial siege engine aiming at units, with logic in lua.
2012-09-11 19:17:24 +04:00
ccefd02ee3
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-10 11:56:23 -04:00
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
9679b7729c
Clean up the movement speed calculation function and move into the core.
2012-09-09 17:04:58 +04:00
ec3d489bda
Move curse-affected attribute value getters to the core.
2012-09-09 12:51:08 +04:00
a36fe25e72
Finish the effective skill computation function, and move to core.
2012-09-09 12:27:40 +04:00
94b729579e
Reindent to remove tabs.
2012-09-09 10:53:08 +04:00
8e0f3e3bce
Added ListBox to gui.dialogs
...
A listbox class. Can be either filled with table of strings, or string+callback tables. Needs some code revision :)
2012-09-09 02:28:07 +03:00
fb88aad51d
Reverse-engineer unit speed computation from DF code.
2012-09-08 21:07:18 +04:00
bfa6ed3e08
Support setting the target area for the siege engine.
2012-09-08 13:46:02 +04:00
325e294af2
Start the siege engine plugin with code to highlight obstacles on screen.
2012-09-07 19:54:32 +04:00
0db873493a
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
2012-09-07 17:24:38 +03:00
e925d8f4d9
Add an API function for reading tiles from the screen buffers.
2012-09-07 11:36:45 +04:00
c971a819de
Experimental creation of map blocks in gui/liquids script.
2012-09-06 22:45:19 +04:00
d5ea05ebb8
Implement a pressure plate sensitive to machine power.
...
When built next to a gearbox, it will monitor its powered state.
2012-09-06 12:37:29 +04:00
3dcaee7cb9
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-05 21:55:17 +03:00
6fc10fc268
Fixed embark anywhere to use more sane code segment search
2012-09-05 21:52:54 +03:00
8d876cc7d9
Support renaming some buildings, and arbitrary units, via gui script.
2012-09-05 21:27:42 +04:00
57086ac56e
Add stock MessageBox and InputBox dialog screens for lua scripts.
2012-09-05 19:45:45 +04:00
27f169e298
Provide a partial application utility function to lua.
...
Implemented in C++ for efficiency.
2012-09-05 17:37:36 +04:00
3b8e3d1459
Fix wrong assumptions in lua wrapper for BitArray.
2012-09-02 17:18:01 +04:00
3713c5ea9e
Add some APIs required by steam engine to the core.
2012-09-02 14:10:58 +04:00
8536785d1d
Boilers made out of unsuitable materials should explode!
2012-09-01 20:46:34 +04:00
532839a4d5
Embark anywhere ported
2012-09-01 10:54:45 +03:00
e0097d8d43
Fix access to unnamed bits in bitfields, and allow hook.apply(false)
2012-09-01 11:25:24 +04:00
7cabf1b843
Small bug fix
2012-09-01 10:13:08 +03:00
d784d4bc40
Static code segment search for memscan.lua
2012-09-01 10:05:31 +03:00
0f1be28637
Follow xml changes.
2012-09-01 00:17:08 +04:00
750eefe48a
Follow unconditional JMP chains in MSVC vmethod ptr detection.
2012-08-30 19:28:53 +04:00
8a617edb10
Support "ls -a" to list scripts in subdirs.
2012-08-29 19:03:53 +04:00
f1915915b4
Follow change in xml again.
2012-08-27 23:03:02 +04:00
5fed060d7d
Follow field rename in xml.
2012-08-27 16:01:11 +04:00
b2bdc199cb
Fix NULL pointer access in ~virtual_identity.
2012-08-26 22:43:18 +04:00
3402a3cd5d
Fix a deadlock problem between suspend in (un)load, and onupdate.
2012-08-26 14:43:14 +04:00
7f1e4b46bc
Implement inheritance-aware vmethod interposing.
...
I.e. overwriting the vmethod in all vtables that use it, not only one.
2012-08-26 14:43:14 +04:00
41ad42d0fd
Expose the liquids plugin engine to lua, and make a wrapper gui script.
2012-08-25 10:37:03 +04:00
9154564e71
Sync up submodules
2012-08-24 21:56:16 +02:00
45efcfc763
Warning: does not work. Temp commit!
2012-08-24 11:40:51 -04:00
8359e80b23
Expose a few API functions to lua, and implement a room browser overlay.
2012-08-24 18:26:18 +04:00
d52c54cc76
Pull some minor stuff from mechanisms into main libs.
2012-08-24 13:49:22 +04:00
296f82b02f
Try using the Objective-C 'alloc + init' idiom for lua screen objects.
2012-08-24 13:28:34 +04:00
e825dc5ddb
Tweak the API for current viewscreen, and dispatch show/dismiss from C++.
2012-08-24 13:20:08 +04:00
b12b9fa91e
Suspend DF around loading and unloading plugins.
...
This is necessary to improve safety of vtable interposing.
2012-08-23 19:51:55 +04:00
c6c5ad56c9
Track lua event listener count, and let the C++ host know.
...
This allows completely avoiding the call overhead if there
are none. The downside is that the event object now has to
be a userdata with lots of metamethods.
2012-08-23 19:27:28 +04:00
1e28ceff6d
Add getProfessionColor and getCasteProfessionColor to Units module
2012-08-22 16:54:00 -05:00
cf4b8a0196
Improve viewport manipulation utilities and support scroll in mechanisms.
...
I.e. allow the user to scroll around with cursor keys,
provided that keeps the cursor still visible.
2012-08-22 22:29:01 +04:00
f0fc3acf87
Turn an assert in vmethod interpose code into a mandatory check and abort.
2012-08-22 18:22:59 +04:00
7987ea9a98
Put some compatibility features into the base dfhack viewscreen.
2012-08-22 18:18:19 +04:00
6e8b68fb29
Add yet one more frame style.
2012-08-22 13:06:06 +04:00
2b79582e99
Implement a policy of marking DFHack-owned screens with a signature.
2012-08-22 12:28:01 +04:00
8969fc9435
manipulator: Inherit from dfhack_viewscreen, and don't use itoa.
2012-08-22 12:23:56 +04:00
51ba252344
Add Screen::drawBorder(string), duplicates DF's interfacest::drawborder()
2012-08-21 15:28:11 -05:00
985d96c596
Allow interposing the 1st vmethod
2012-08-21 15:27:29 -05:00
15235cc938
More work on utilities for making lua viewscreens.
2012-08-21 19:40:37 +04:00
451e965936
Add a Painter class for lua viewscreens, and extract other utilities.
...
Painter clips to an arbitrary rectangle window, and
tracks current cursor and color state.
2012-08-21 11:35:39 +04:00
601a3a7927
Add a script that implements a linked mechanism browser.
2012-08-20 23:04:01 +04:00
38a07a4ca5
Export the tile finder function to lua, and improve mouse event reporting.
2012-08-19 20:00:10 +04:00
cacb082416
Add a stupid example of a lua-controlled viewscreen.
2012-08-19 17:53:25 +04:00
30f71ff510
Implement support for lua-backed viewscreens.
2012-08-19 14:27:44 +04:00
b8ee52131b
Add a module for painting tiles into the gps global.
2012-08-19 09:31:09 +04:00
fd0bf2ef92
Extract the color enum from color_ostream to toplevel.
2012-08-19 09:21:25 +04:00
c6694e386f
Add rather inefficient type_identity wrapping for std::set.
...
Accessing an element is O(N), as if it was walking a list.
2012-08-18 14:34:20 +04:00
24cc8b5c7a
Expose an API to claim the suspend lock from the Core.
...
Previously it was hard-coded in Core::Update, but interposed
vmethods may need this feature too.
2012-08-18 11:52:38 +04:00
01ba2a31fc
Tweak the interpose API, and fix a couple of bugs.
2012-08-18 11:48:07 +04:00
236ffd578b
Add experimental support for interposing vmethods of known classes.
...
The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API.
2012-08-17 22:40:53 +04:00
bcc41c081a
Add a utility function for patching read-only memory.
2012-08-17 15:07:48 +04:00
61185d29ca
console-linux: silence minor gcc warnings
2012-08-12 00:27:20 +02:00
589be93fbf
Sync with structures
2012-08-02 14:44:59 +02:00
9705497a7e
Merge branch 'master' of git://github.com/peterix/dfhack
2012-07-17 10:39:20 -05:00
bf82b2d20d
Sync with df-structures
2012-07-17 10:35:20 -05:00
1c9194d1c4
While installing scripts, do not copy ~ files.
2012-07-12 02:24:32 +02:00
a5977db443
Merge https://github.com/jjyg/dfhack
2012-07-09 01:13:07 +02:00
6975f643fc
Fixage, syncing with structures
2012-07-09 01:05:40 +02:00
c20951c30b
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-07-06 20:37:14 +02:00
028b47a321
update xml
2012-07-06 20:36:53 +02:00
4bbb185f7b
Fix build and allow autodump to any walkable tile (e.g. a stair).
2012-07-06 20:11:20 +04:00
8e17ebbefc
add SC_PAUSED / SC_UNPAUSED onStateChange events
2012-07-05 18:03:02 +02:00
23d28f9961
Update df-structures dependency
2012-07-05 10:32:32 -04:00
e4d4bf23ae
update xml, fix autolabor with new trade depot flags name
2012-07-04 19:05:44 +02:00
cdd711efa4
add COAL subtypes in MaterialInfo::getToken
2012-07-04 17:31:41 +02:00
a7a25b80a0
ruby: use the color_ostream argument from dfhack to output to dfhack-run
2012-07-03 16:13:15 +02:00
c24333515b
Merge branch 'master' of https://github.com/jjyg/dfhack
...
Conflicts:
library/Core.cpp
Starting to merge in Ruby stuffs
2012-07-02 11:07:30 -04:00
421e5fd82c
Swap order of includes to work around silly compiler/assembler bug on OS X
2012-07-02 11:02:48 -04:00
6f433ff58f
Move back to using interposition to be more portable
2012-06-29 10:15:48 -04:00
ccbebdafb0
fix error spam when using Zoom hotkeys
2012-06-28 15:05:00 +02:00
d5ae1fc4f2
Merge branch 'master' of https://github.com/danaris/dfhack
...
Conflicts:
depends/clsocket
package/darwin/dfhack
package/darwin/dfhack-run
Fixed.
2012-06-24 18:41:24 -04:00
7cdbae3f04
Update df-structures
2012-06-24 18:35:16 -04:00
552da8417e
ruby: handle .rb files in df/hack/scripts/
2012-06-24 20:24:46 +02:00
9046fed648
Add documentation for some utility functions implemented in lua.
2012-06-24 12:51:19 +04:00
59fb4daa9a
Merge https://github.com/angavrilov/dfhack
2012-06-23 00:25:50 +02:00
6199d6915c
Nuke some error prints.
2012-06-23 00:25:30 +02:00
bd37cc09c5
Update the Lua API document with info about scripts.
2012-06-22 20:17:55 +04:00
65e82f7c12
Support controllable error presentation verbosity in lua code.
...
Use qerror to squash stack traces and location prefix.
2012-06-22 16:36:50 +04:00
752da9ced5
Move formatting newly-found globals for symbols.xml to lua code.
2012-06-21 21:26:25 +04:00
f207714d42
Add finders for enabler, gps and init.
2012-06-21 21:08:36 +04:00
ed4acbdedb
Add a searcher for current_weather, using a prepared save.
2012-06-20 10:12:26 +04:00
4ca3aa878a
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-06-19 14:48:40 -04:00
e687a07f2e
Fix getRebaseDelta: should be signed int.
2012-06-19 21:02:27 +04:00
707fcc55e5
Update xml repo
2012-06-19 10:52:08 -04:00
40e764a46b
Some more tweaks to the memory-finding code
2012-06-19 10:51:47 -04:00
50bd758876
Replace dfhack.internal.getBase with getRebaseDelta.
...
Also, when printing found offsets, subtract the delta.
2012-06-19 18:48:22 +04:00
50dff56899
Rewrite getMemRanges for windows to get rid of a number of problems.
...
- Properly handle copy-on-write permission modes.
- Merge ranges with the same properties for us.
- Don't skip non-private areas.
- Use the mapped filename as name, so that it works for all ranges.
2012-06-19 18:41:18 +04:00
bd5b675fa5
Add ui_menu_width finder, tweak instructions, and add a case for win exe.
2012-06-18 21:11:54 +04:00
9b941bcd4d
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Trying out angavrilov's changes
2012-06-18 09:29:20 -04:00
dc6cb61979
Add more offset finders to the script.
2012-06-17 18:44:59 +04:00
fa41a27f26
Add an api function to get vtable address from version info.
2012-06-17 14:26:27 +04:00
67536da2fe
Add an interactive script finding a limited subset of linux offsets.
2012-06-16 19:51:15 +04:00
927ce6ce5a
Fix a problem with number to address cast for high-half addresses.
...
If the address is out of the signed int range, lua_tointeger produces
unspecified result. lua_tounsigned is guaranteed to wrap.
2012-06-16 17:09:58 +04:00
db91850464
Sync to the change in gamemode/gametype globals.
2012-06-16 14:42:56 +04:00
dc5bef2cb8
Add lua internal api functions needed for scanning memory.
2012-06-16 13:33:49 +04:00
14a3e5cd9e
Implement getMemRanges() on the Mac
2012-06-14 13:43:20 -04:00
9c35e9fa59
Ensure that the appropriate libz.dylib is used
2012-06-14 13:43:03 -04:00
f2a30c1a92
Remove build-time dependency on SDL
2012-06-14 13:42:40 -04:00
12543d6a5b
Make offsets with "darwin" os-type recognized as Apple, rather than ignored
2012-06-14 13:42:06 -04:00
94dfdb486d
Change the field names returned from dfhack.internal.getMemRanges()
...
'end' is a lua keyword, so it cannot be used conveniently.
2012-06-14 20:32:23 +04:00
c6700585bc
Merge branch 'master' of github.com:peterix/dfhack
2012-06-14 09:59:53 -04:00
0ced9d9941
Hopefully fix DFHack's attempt to pull libstdc++ from somewhere silly (for portability)
2012-06-14 09:56:20 -04:00
19595f5225
Disable a whole bunch of no-longer-necessary debug output
2012-06-14 09:55:34 -04:00
9469f27559
Make the RPC server accept a range of client versions.
...
Otherwise it sort of defeats the purpose of using version handshake.
2012-06-14 13:15:37 +04:00
bbc1fb010e
Fix TEXT mode support, even making it work somewhat.
...
- Initialize the global pointers before trying to use init.
- Print a message suggesting the use of dfhack-run.
- Don't start the console thread if there is no console.
- When console is disabled, print anything given to it to stderr.
2012-06-14 13:08:39 +04:00
7eb4fc19de
Make dfhack.run_script usable from other scripts, and document it.
2012-06-14 12:46:12 +04:00
2781723f7b
Linux build works again.
2012-06-14 02:25:15 +02:00
316973c463
Re-add fake SDL headers, get rid of real SDL use.
2012-06-14 02:15:43 +02:00
eaac32c765
Version bump and text updates.
2012-06-14 00:29:01 +02:00
52f9fe4a6a
Merge https://github.com/danaris/dfhack
...
Conflicts:
depends/clsocket
2012-06-14 00:00:36 +02:00
5e011ac217
Merge https://github.com/jjyg/dfhack
2012-06-13 23:56:26 +02:00
149f175909
Make primitive refs (i.e. pointers to numbers, etc) behave as arrays.
2012-06-13 22:40:39 +04:00
c50b605dfc
Support casting references and allocating arrays of numbers in lua wrapper.
2012-06-13 22:26:54 +04:00
8d7cf092fd
Add Lua API for access to some contextual and low-level info.
2012-06-13 21:12:36 +04:00
c364b42049
fix minor gcc warning
2012-06-13 00:21:23 +02:00
95606ee3dc
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-06-11 16:00:00 +02:00
c97e3bca0c
Sync structures again
2012-06-07 21:22:19 -05:00
9dbcaa2733
Support adventure mode and stockpile screens in focus strings.
2012-06-06 18:54:06 +04:00
7aff2d6bc0
Sync structures for .34.11
2012-06-05 14:33:06 -05:00
d35d8d3431
Add the script to fix lagging fat dwarves.
2012-06-05 14:06:29 +04:00
b7edbf2076
Support 7-argument vmethods.
2012-06-05 14:00:52 +04:00
b612532348
export openplugin/lookupplugin from plugin manager
2012-06-02 23:35:05 +02:00
470c9f60aa
remoteclient: dont use gcc deprecated auto_ptr
2012-05-31 13:23:00 +02:00
6d65683b02
Adjust packaging for Mac
2012-05-29 16:12:35 -04:00
20a00f53c4
When built with the right compiler, we don't need any Obj-C code.
2012-05-29 14:44:37 -04:00
f71a843c6e
Don't throw a fatal exception just because os-type isn't something we recognize - ignore it and move on
2012-05-28 11:06:23 -05:00
7ec0fd6fc0
Trying to set up an autorelease pool, but not yet succeeding.
2012-05-26 16:08:15 -04:00
e72bf1ac9a
Sync to changes in df-structures.
2012-05-26 14:49:27 +04:00
8644ea4dc0
Merge remote-tracking branch 'q-github/master'
2012-05-26 14:41:36 +04:00
1dd4cc5667
More work on getting dfhack building & compiling on Mac OS X
2012-05-25 14:28:59 -04:00
44c3afc306
Merge git://github.com/quietust/dfhack
...
Gotta get the changes that prevent DFHack from crashing.
2012-05-24 15:39:11 -04:00
7e88631698
Trying a different method now (with install_name_tool)
2012-05-24 15:02:53 -04:00
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
2b862655b7
Allow compiling RelWithDebInfo on Windows
2012-05-23 13:38:16 -05:00
64ea06bbfe
Don't crash if "gps" is null
2012-05-23 13:38:01 -05:00
9a73ea9f14
Cleanup World module to use df::global, and fix crashes when control_mode/game_mode are missing
2012-05-23 12:51:03 -05:00
9adf310d7f
Update Units::isCitizen after looking at game-over detection code.
2012-05-22 12:31:37 +04:00
1e09d67fc3
Merge https://github.com/angavrilov/dfhack
2012-05-21 20:32:50 +02:00
81022451c2
Support sorting items in stocks, and correct unit sorting in joblist.
2012-05-21 22:29:03 +04:00
7866ab239e
Track structures
2012-05-21 20:28:17 +02:00
34f08c0223
Handle the stocks screen in the focus strings.
2012-05-21 21:30:53 +04:00
87a26ffa51
Track structures
2012-05-21 18:49:27 +02:00
8ef1423ee7
Merge https://github.com/angavrilov/dfhack
2012-05-20 23:01:44 +02:00
32d6257c70
DF code analysis uncovered another item-related flag to clear.
...
It turns out, buildings cache their 'site is blocked' state,
and won't actually recheck until the flag is cleared.
2012-05-20 21:58:43 +04:00
b992b04f0b
Remove stuff that shouldn't be in the core, and expose to lua what's left.
...
Specifically, any "if (verbose) { Core::printerr("blah") }" kind
of stuff definitely doesn't belong in the common API functions.
Also, ref->getUnit() is very expensive.
On the other hand, checks for crash-inducing conflicts with the
ui should be in the core api, and not in client plugins.
2012-05-20 21:57:45 +04:00
df3e1bb517
Sync submodules
2012-05-20 17:35:34 +02:00
3fa155e8e6
Merge https://github.com/angavrilov/dfhack
2012-05-20 17:33:09 +02:00
d28d240dbd
Merge remote-tracking branch 'kmartin/master'
2012-05-20 11:03:41 +04:00
abbe0ceb8d
Fix order-of-operations oopsie in DFHack::Items::moveToInventory
2012-05-19 14:13:32 -05:00
bc7dbe1175
Merge derp fixed.
2012-05-19 20:03:08 +02:00
1b4a24c827
Support using focus strings to limit keybinding scope.
2012-05-19 21:31:42 +04:00
51f06c78fc
Merge https://github.com/playfordh/dfhack
...
Conflicts:
library/include/modules/Items.h
library/modules/Items.cpp
2012-05-19 19:09:13 +02:00
ba45ac42c2
Track submodules
2012-05-19 18:34:50 +02:00
7774f5f2c1
Add a mechanism converting ui focus to a string representation.
...
The idea is to make ui handling more modular, dispensing with
huge functions that switch or if/else on lots of variables.
For now, used to split up functions in the sort plugin.
2012-05-19 19:50:36 +04:00
4aa6dbdd00
Support sorting items in the trade screens.
...
Caveat: sorts items in containers independently from the container.
2012-05-18 19:18:49 +04:00
1333dc569f
Merge https://github.com/Caldfir/dfhack
2012-05-18 17:42:34 +02:00
ed6da7618a
Merge https://github.com/warmist/dfhack
2012-05-18 17:41:09 +02:00
3c44e22760
Support trade viewscreens in Items::getSelectedItem.
2012-05-18 17:54:05 +04:00
51ad697bf5
Fix unresolved symbol reference in Windows platform.
2012-05-18 08:25:25 -05:00
48185568e9
Added df::Items::moveToBuilding. Moved item from ground to building, usefull for museum forts (placing items on tables)
2012-05-18 16:05:29 +03:00
3f542b4df1
Update merge
2012-05-18 07:40:05 -05:00
52426f9035
Track xml
2012-05-17 20:41:41 +04:00
f37f708b37
Add a workaround for Planepacked bug in buildings constructed via API.
...
Buildings hanging in the air cause constructWithFilters to
exhibit the same behavior as a moody dwarf in a burrow excluding
the workshop, i.e. endlessly collecting the same type of reagent.
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1416
The workaround monitors jobs and reclassifies the reagents on the fly.
2012-05-17 20:38:27 +04:00
e9ef9b87b5
Add central locations for onUpdate and onStateChange handling in core.
2012-05-17 20:04:09 +04:00
2c0024adc9
Make Items::getPosition exactly match the DF original in behavior.
2012-05-17 19:56:55 +04:00
efdb709284
Support creating rollers and stops with dfhack.buildings.constructBuilding.
2012-05-17 00:19:29 +04:00
68c5d9b86c
Stop Shift-Enter from being handled as if it was Shift-M.
2012-05-16 18:10:07 +04:00
dbd39af58a
Support testing and modifying pending timeout callbacks.
2012-05-16 17:06:08 +04:00
e77c9dc730
Add new PUSH_HAUL_VEHICLES labor to autolabor.
...
This commit will only work with 0.34.08 (or later).
2012-05-15 13:42:48 -05:00
27ca317871
Added new method - Items::moveToInventory(...)
...
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:01:59 -04:00
d4f9806568
Track library
2012-05-14 17:30:21 -05:00
e078c75737
Track submodules
2012-05-14 13:44:03 -05:00
642a625586
Support custom buildings in dfhack.buildings.getFiltersByType.
...
Also document it and constructBuilding in Lua API docs.
2012-05-13 18:39:00 +04:00
87ec1de891
Improve lua api for tile biome access.
2012-05-13 13:58:41 +04:00
c6b52067bd
Request designation rescan in auto-growing burrows.
...
This improves performance of burrowed miners digging 1-wide tunnels.
2012-05-12 20:54:26 +04:00
60bb486aba
Add api for enabling liquid and temperature updates for blocks.
...
Now updates also have to be enabled for the z level to work.
2012-05-12 20:12:09 +04:00
af3e389093
Update submodules.
2012-05-12 18:50:22 +04:00
92f069e209
Brush output lists numbers, update xml.
2012-05-11 07:00:18 +02:00
d6813c7690
Change xml submodule pointer.
2012-05-08 19:08:34 +04:00
191071beb6
Add more lua scripts.
2012-05-08 12:55:06 +04:00
fca618ff1b
Support default building inputs in dfhack.buildings.constructBuilding.
2012-05-06 19:11:29 +04:00
9ad8d767b4
Add code for adding abstract buildings and removing constructions.
2012-05-06 19:09:11 +04:00
b70130cf36
Add a couple more building api functions.
2012-05-06 11:22:55 +04:00
05e8083c84
Allow constructing itemless actual buildings.
2012-05-06 10:09:39 +04:00
3bd44e5367
Move some things that won't work in dfhack-client to a separate file.
2012-05-05 21:07:18 +04:00
81f2240c23
Fix some things that confuse MSVC.
2012-05-05 20:46:28 +04:00
7e01b004e9
Implement timeouts in the core lua context, and quicksave script.
2012-05-04 20:59:06 +04:00
d4d6349f48
Expose builtin commands to dfhack-run, and add lua script support.
...
Move builtin command implementation to Core methods, and fall
back to hack/scripts/*.lua for otherwise unrecognized commands.
2012-05-04 19:47:18 +04:00
5afe2ca002
Update dfhack for specific_ref.
2012-05-03 11:47:04 +04:00
28b5068382
Allow both coordinate object and (x,y,z) as arguments to getTileBlock.
2012-05-02 12:50:05 +04:00
eadce95940
Add a convenience function for designating constructions.
2012-05-01 19:55:25 +04:00
4cffb6428d
Update building creation code with new knowledge, and fix zone.
...
Also, document new lua api, and add a more convenient wrapper.
2012-05-01 18:55:30 +04:00
2303a25bde
Implement unconstructed building instance creation and linking into world.
...
For more flexibility, the base api is split into 3 phases:
alloc, setSize, and construct. No support for non-actual
buildings like stockpiles and activity zones at the moment.
2012-04-29 21:07:39 +04:00
82a0e52a3e
Add api to check the walkable cache, and update flow_forbid in liquids.
2012-04-26 18:51:39 +04:00
16ee049664
Split off the burrows api from Maps and Units.
2012-04-26 12:56:28 +04:00
6ab270d129
Retrieve unit noble position info, and use it in getProfessionName.
2012-04-26 12:03:56 +04:00
9489c6ed1a
Add support for a few more viewscreens to Units::getSelectedUnit.
2012-04-26 11:05:35 +04:00
1cd802d426
Implement unit sorting for the pen zone assignment interface.
2012-04-25 18:28:00 +04:00
763a301b4f
Add a few more lua api functions, documentation, and unit sort orders.
...
Units::getProfessionName appears to work correctly for
everything except nobles.
2012-04-23 21:30:53 +04:00
035d65536b
Added in job loading to t_unit for stonesense.
2012-04-22 18:51:27 -07:00
125cd6622a
Support sorting units in many more ui contexts.
2012-04-22 19:22:00 +04:00
2ef321a208
Preserve the original lua global environment for modules.
...
The intent is to prevent accidental pollution of module namespaces
by globals defined from careless scripts running in the _G environment.
2012-04-21 20:15:57 +04:00
4af051bab3
Add a few more unit orderings, and a way to reverse direction.
2012-04-21 16:53:17 +04:00
3282ac3db2
Add a hotkey command that sorts units in lists using lua comparators.
2012-04-21 15:43:52 +04:00
adbd351462
Rename units.other[0] to units.active.
2012-04-21 12:46:55 +04:00
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
d95cc3435f
Fix lua wrapper sizeof for static arrays.
...
Since it actually depends on the element type, it is more tricky.
2012-04-20 13:04:03 +04:00
0b32d374db
Implement SOIL/STONE substitution logic, and add compat in mapexport.
2012-04-19 23:02:30 +04:00
4b87f1bcac
Refactor MapCache: make it parse everything that is known re tiles & mats.
2012-04-19 19:17:07 +04:00
f655a0986d
Sync to changes in the data structure definitions.
2012-04-19 11:03:29 +04:00
d825356878
Fix windows console bug
...
Line input cursor was going crazy when input reached right side of the screen
2012-04-17 23:23:45 +02:00
c031349a62
Track structures
2012-04-17 21:48:18 +02:00
378a1fb914
Support the '#' string as index for wrapper vector insert at end.
2012-04-17 12:15:45 +04:00
3beb2ebf25
Export the onStateChange event to core lua context & add some docs.
2012-04-17 11:45:09 +04:00
7946cafc86
Merge https://github.com/jaxad0127/dfhack
2012-04-16 22:37:07 +02:00
17d5b2de04
Multiline interpreter.
...
To test try writing for k,v in pairs(table) do <enter> print(k) <enter> end
Also prompt could be changed (couldn't think of anything better).
2012-04-16 18:46:20 +03:00
1e64a6a2f6
Make dfhack.lineedit automatically interact with RunCoreQueryLoop.
...
It still falls back to the original waiting mode if yield fails.
2012-04-16 18:05:42 +04:00
9c25351281
Add a template to make using lua_pcallk a bit more convenient.
2012-04-16 18:01:21 +04:00
3e4863bc80
Integrate coroutines with table-based error handling.
...
Properly attach stack traces to errors passing the resume boundary.
Replaces coroutine.resume and coroutine.wrap with appropriately
modified versions, and adds a Lua::SafeResume function for C++.
2012-04-16 14:45:04 +04:00
48e4717dd2
Try working around some msvc problems.
2012-04-16 10:59:55 +04:00
a1756a864c
Implement a way to do prompts from core context.
...
The trick obviously is doing it without forcing DF to wait suspended.
Fortunately, lua has built-in coroutine support, so the interactive
prompt can simply yield and rely on the external loop to do the job.
To use this however the REPL had to be replaced with lua code.
2012-04-15 21:50:22 +04:00
14709e5d45
Add an official core lua context, and allow plugins to send events to it.
...
- This context requires core suspend lock and asserts it in a few places.
- Special 'event' objects are introduced. They can be invoked as
functions, in which case they iterate all their fields and call
them as functions. Errors are printed and consumed.
- When a plugin is opened by the core context, events registered in
a special array are linked to it. The system is organized so as to
avoid even trying to pass the event to lua if the module isn't loaded.
2012-04-15 19:09:25 +04:00
f3c7a685f5
Make tiletypes more useful
...
* Paint, filter, and brush state is now saved between calls.
* Added 'all' paint option to set material, shape, special, and variant at
the same time.
* Added tiletypes-here (like liquids here, except is uses the saved brush
settings)
* Added tiletypes-here-point (like liquids here, always only the tile under
the cursor)
* Added tiletypes-command: runs tiletypes commands seperated by ';' tokens
(affects saved state)
* Make the internal workings match liquids a bit more
* Give brush objects a descriptor string
* Make Core::cheap_tokenise available
2012-04-15 08:40:19 -06:00
cb27a1d839
Fix typo in the 1MB constant.
2012-04-15 11:31:05 +04:00
fc38371b29
Clean up some chaos in old code.
2012-04-15 01:15:15 +02:00
5f1c933b0f
Merge pull request #148 from wjrogers/feature-protobuf-api
...
Add SetUnitLabors and additional optional data to ListUnits
2012-04-14 14:56:19 -07:00
fa063e2936
Track structures, fix trivial problem in zone plugin
2012-04-15 00:35:59 +02:00
cb49c92b99
Allow plugins to export functions to lua with safe reload support.
...
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 19:44:07 +04:00
7a34a89f53
Add burrow subcommands to modify burrow unit and tile sets.
2012-04-14 14:12:59 +04:00
2f54a48e63
Add a plugin that makes selected burrows auto-grow on digging.
2012-04-13 21:41:42 +04:00
37cfb1fdcd
Add unit position and container api.
2012-04-13 16:10:19 +04:00
2d8611a480
Add core api for moving items between ground and containers.
2012-04-12 18:37:27 +04:00
38a8c43a25
Reverse-rebase the vtable pointers printed to stderr.log.
2012-04-12 11:21:25 +04:00
583ccdcc0c
Support pre-initializing vtable pointers from symbols.xml
2012-04-12 10:54:53 +04:00
5d5502ae34
Update the item owner modification api and export it to lua.
2012-04-11 20:10:31 +04:00
0c2b78b96b
Add api for manipulating burrows to the core.
2012-04-11 19:42:05 +04:00
61245711f7
Export a few maps functions to lua.
2012-04-11 16:20:16 +04:00
c7b922250b
More maps api refactoring and renaming.
...
getBlockAbs is a very confusing name; getTileBlock is better.
2012-04-11 12:01:27 +04:00
8c40a27ea0
Add unit_misc_trait list to BasicUnitInfo protobuf API.
2012-04-10 20:42:23 -04:00
6cf8220f28
Add SetUnitLabors protobuf API.
2012-04-10 20:41:54 -04:00
59ddbfacb7
Implement item occupancy tracking in MapCache.
2012-04-10 20:19:41 +04:00
b15d2da819
Get rid of some obsolete api functions, and restructure MapCache.
2012-04-10 18:21:19 +04:00
249be0c1a0
Change SC_MAP_LOADED handling: only NULL/not NULL change is meaningful.
2012-04-10 12:11:00 +04:00
93c795cfc3
Job module api tweaks: add a namespace to match others and some funcs.
2012-04-10 11:43:36 +04:00
0e0740fddf
Stop printall(df.global) from breaking if there are unknown addresses.
2012-04-10 10:34:03 +04:00
585de77489
Track structures
2012-04-09 00:59:57 +02:00
45ae2ed67f
Pull a few utility functions into the core and publish to lua.
2012-04-07 19:08:30 +04:00
e74788cb26
Add a generic facility for object finalization during stack unwind.
...
Supports two modes of finalization:
- try {...} finally {...}
- try {...} catch { ...; throw }
Argument passing discipline is designed with vararg tail calls in mind.
2012-04-07 14:21:38 +04:00
0daafef690
Wrap MaterialInfo for lua.
2012-04-06 19:56:19 +04:00
2640addf49
Split LuaTools.cpp to separate core utils from general dfhack api.
2012-04-06 18:00:54 +04:00
903e9ee716
Export a few more functions to lua.
2012-04-06 11:21:28 +04:00
9eed9f0d24
Wrap a few utility functions defined on the c++ side for lua.
2012-04-05 19:55:59 +04:00
28a741082f
Encode & decode names in utf-8 for transfer in remote messages.
...
That's the encoding required by the protobuf spec.
2012-04-05 18:10:16 +04:00
59f411e401
Oops, forgot return statement.
2012-04-05 12:32:10 +04:00
3afed43cdb
Experimental: try wrapping a dfhack api function.
2012-04-05 11:59:39 +04:00
d1b27418a6
Add a World::GetPersistentData version that auto-adds if not found.
2012-04-05 11:32:23 +04:00
a45e83ef14
Merge pull request #146 from wjrogers/feature-protobuf-api
...
Add ListJobSkills protobuf API
2012-04-04 16:46:20 -07:00
1b6f5f3f34
Add additional related data to ListJobSkills.
...
Add the attributes for profession and unit_labor, and (re)name the
protobuf messages JobSkillAttr, ProfessionAttr, and UnitLaborAttr to
better reflect their content and distinguish them from e.g. the
SkillInfo message included in BasicUnitInfo.
2012-04-04 11:53:47 -04:00
7efbd798ce
Upgrade lua errors to structures when attaching stack trace.
...
This allows detecting when it's re-thrown and avoiding attaching the
stack twice, and so on. Would also be useful if debugging is added.
2012-04-04 13:34:07 +04:00
81fb57a853
Add color output and input prompt support to core lua api.
2012-04-04 10:40:33 +04:00
7e896277ec
Don't export describeJobSkills.
2012-04-03 14:22:46 -04:00
59d7b6faab
Add ListJobSkills.
2012-04-03 14:03:06 -04:00
2d4af4ac3e
A few more utility functions for lua.
2012-04-03 20:02:01 +04:00
42a9b0a592
Make Core::Suspend safe in plugin_onupdate by pretending to hold the lock.
...
It is in essence true that OnUpdate owns the suspend lock, so
expose it officially to the recursive suspend lock mechanics.
2012-04-03 13:29:59 +04:00
444377f9db
Finish documenting the DFHack core lua api existing so far.
2012-04-03 13:13:44 +04:00
a8fe0eccb4
Add functions for checking validity of lua wrapper objects.
2012-04-02 22:02:04 +04:00
467f4108ae
Track structures
2012-04-02 13:42:56 +02:00
2a998a5b8a
Merge https://github.com/quietust/dfhack
2012-04-02 13:42:18 +02:00
06da0f9720
Fix coord/coord2d division/modulo operators to properly handle negative numbers (fixes some glitches with revflood and possibly other utils)
2012-04-01 19:44:35 -05:00
d109b6570b
Add dfhack.with_suspend(f[, args...]) that calls f with core suspended.
...
The lock is properly removed in case of error, which is then propagated.
Just for fun, it also can be yielded from within in a coroutine.
2012-04-01 19:38:42 +04:00
e3d50b9b04
Optimize wrapper: use pointers instead of strings as most frequent keys.
2012-04-01 18:34:04 +04:00
604c84953b
Fix a bug: LookupTypeInfo cannot assume the result is userdata.
2012-04-01 17:59:47 +04:00
a3e526abdb
Add df.is_instance(a,b) to check if typeof(b) is subtype of typeof(a).
...
Allows both objects and types as arguments. Also accepts nil and
primitives as b, returning nil.
2012-04-01 17:32:57 +04:00
edd63080b5
Only print the shortcut help once in the lua interactive mode.
2012-04-01 17:00:25 +04:00
afe4eba957
Improve performance of the persistent data api, and wrap it for lua.
...
Use an stl table for string keys to avoid linear cost of lookup.
This uncovered a bug in the new luaL_getsubtable function.
2012-04-01 16:43:40 +04:00
a9a6fbd8b5
Lua tweaks: a couple of functions, dfusion tweak, backtrace metadata.
2012-04-01 12:50:56 +04:00
7ff728b6fc
Track world and map changes separately for plugin_onstatechange
2012-04-01 02:56:54 +02:00
209b261284
Get rid of MALLOC_FILL build option
2012-04-01 00:30:42 +02:00
4bac6edd79
Merge https://github.com/rh73/dfhack
2012-04-01 00:29:00 +02:00
9d6e26fa5f
Fix crashing color_ostream::printerr due to vfprintf vs fprintf mixup.
...
Also enable heap clearing in gdb mode, and fix a few newlines.
2012-03-31 22:26:41 +04:00
39787e9cd5
Renamed digging commands to uniformly start with 'dig*'(vdig -> digv etc). Added command digl, diglx (dig layerstone instead of veins). Updated readme.rst.
2012-03-31 15:41:55 +02:00
0f41608ed4
Pull console output support and REPL out of dfusion into core lib.
2012-03-31 15:40:54 +04:00
9384f0c842
Update lua to 5.2 and fix obvious breakage due to obsolete api.
2012-03-31 12:11:43 +04:00
10b610669f
Give some sensible looking names to the arrays in pregnancy_ptr.
2012-03-31 10:31:45 +04:00
a01f512733
Track structures
2012-03-31 01:33:14 +02:00
543f3970db
Tweak readme, bump version to 0.34.07
2012-03-31 01:13:21 +02:00
5d8415c8d9
Merge https://github.com/warmist/dfhack
...
Conflicts:
plugins/Dfusion/luafiles/init.lua
2012-03-30 20:32:57 +02:00
81bc73f435
Follow a typo fix in flag name.
2012-03-30 10:44:52 +04:00
07bb51946f
Fix bug in MapCache - squash veins with the correct priority
2012-03-29 18:59:07 -05:00
ec48405f0a
Fix mistake: static initialization code cannot access other static objects.
...
Specifically, the eid->type() call depends on the order of linking.
2012-03-29 22:56:06 +04:00
004acdad4e
Tweaks!
...
Strip commands.clear() from all plugins
Fix changeitem - a variable name has changed in item flags
2012-03-29 18:37:22 +02:00
cc54d5dfa9
Merge branch 'master' of git://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-03-29 16:12:54 +02:00
9b75373403
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
library/xml
2012-03-29 16:03:12 +02:00
88c914142b
added plugin changeitem (change material type and base quality)
2012-03-29 15:33:54 +02:00
a9b7c74a23
Allow assigning NULL lightuserdata to pointers, and export a global.
...
Otherwise there is no way to specify NULL via recursive lua table assign.
2012-03-29 14:47:33 +04:00
85c91c92d8
Implement __pairs and __ipairs for DF objects.
...
Structs enumerate fields in memory order in pairs().
Containers & biftields enumerate int indexes in ipairs, and
string keys in pairs (i.e. using index-enum for arrays).
2012-03-29 14:39:13 +04:00
17ff235c81
Use codegen.out.xml instead of static.inc in cmake code generation rules.
...
Now only that file is guaranteed to always be overwritten.
2012-03-29 10:59:54 +04:00
d82120a3db
More fixes
...
Include unistd.h in linux process file
Fix assert in autolabor
Don't print 'script missing' error on DF start
2012-03-29 02:49:44 +02:00
757ad3334c
Track structures
2012-03-29 00:27:03 +02:00
6235d2e801
Merge https://github.com/angavrilov/dfhack
2012-03-28 19:53:10 +02:00
95ec363a7f
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/LuaTypes.cpp
library/LuaWrapper.cpp
2012-03-28 11:51:49 -05:00
e4e643f9d2
Clear the command vector during plugin load and unload to avoid confusion.
2012-03-28 18:47:03 +04:00
b7ff7681ac
Merge remote-tracking branch 'peterix/master'
2012-03-28 15:07:13 +04:00
06188da380
Track structures
2012-03-28 12:46:50 +02:00
40cf5fe538
Track structures
2012-03-28 11:46:23 +02:00
929657bed4
Disable pointer auto-vivification unless new is specified.
...
Since it is essentially allocating non-gc managed objects,
it can lead to memory leaks and shouldn't happen invisibly.
Also support using the 'assign' key to request assign()
from another object before processing the current map.
2012-03-28 17:00:07 +08:00
fe091de0b2
Fix F keys in keybindings: they obviously don't have unicode symbols.
2012-03-28 17:00:06 +08:00
b76bdad50f
Implement recursive transfer of values from lua to c++ structures.
...
E.g. df.global.cursor = { x = 1, y = 2, z = 3 }. The lua data
must be represented by raw lua tables.
For structs, the entries in the table are assigned to matching fields.
For containers, if a 'resize' field is missing or nil, the table is
treated like 1-based lua array, and the container is resized to match
its # length. Otherwise, the field must be either an explicit number,
true or false. If it is true, the size is selected by the highest index
in the table. After that, entries are copied using 0-based indices.
For pointers, the table must match the target object. If the pointer
is null, the object is auto-allocated; this can be controlled using
the 'new' field, the value of which will be passed to df.new().
2012-03-28 16:58:51 +08:00
ee94894516
Disable pointer auto-vivification unless new is specified.
...
Since it is essentially allocating non-gc managed objects,
it can lead to memory leaks and shouldn't happen invisibly.
Also support using the 'assign' key to request assign()
from another object before processing the current map.
2012-03-28 11:28:42 +04:00
d6e6fc483f
Fix F keys in keybindings: they obviously don't have unicode symbols.
2012-03-28 11:25:55 +04:00
be2a7af362
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-27 14:14:04 -05:00
6656852fff
win32 SetConsoleTextAttribute doesn't know what COLOR_RESET (-1) is
2012-03-27 13:22:45 -05:00
bc74c5984e
Implement recursive transfer of values from lua to c++ structures.
...
E.g. df.global.cursor = { x = 1, y = 2, z = 3 }. The lua data
must be represented by raw lua tables.
For structs, the entries in the table are assigned to matching fields.
For containers, if a 'resize' field is missing or nil, the table is
treated like 1-based lua array, and the container is resized to match
its # length. Otherwise, the field must be either an explicit number,
true or false. If it is true, the size is selected by the highest index
in the table. After that, entries are copied using 0-based indices.
For pointers, the table must match the target object. If the pointer
is null, the object is auto-allocated; this can be controlled using
the 'new' field, the value of which will be passed to df.new().
2012-03-27 21:47:52 +04:00
22d775f95c
Fix sscanf parsing the memory map on linux, so that dfusion loads.
2012-03-26 21:05:24 +04:00
4e78947b10
Track structures
2012-03-26 16:13:41 +02:00
157f23be5c
Fix warnings.
2012-03-26 12:42:05 +04:00
00a5bfcf3e
Work around a msvc issue with spurious specialization ambiguity errors.
2012-03-26 10:46:51 +04:00
1a19e17695
Track structures, stonesense
2012-03-26 03:39:14 +02:00
d0090e9551
Fix lua wrapper: create one function identity instance per method.
...
Otherwise all methods of the same prototype are lumped into one.
2012-03-25 21:12:20 +04:00
1d81cb56ba
Make enum attributes accessible through the lua wrapper.
...
TODO: make them completely read-only.
2012-03-25 19:12:59 +04:00
0412aaebe4
Add a delete() method to the objects in the lua wrapper.
2012-03-25 15:48:18 +04:00
7209e4d3f2
Attach static methods to the type objects in the lua wrapper.
2012-03-25 15:20:58 +04:00
8d345be6e7
Expose virtual methods in the lua wrapper.
2012-03-25 14:06:05 +04:00
947adeac83
Silence warning 4482
2012-03-24 18:18:29 -05:00
645e5eb2c1
track structures
2012-03-24 22:44:16 +01:00
39f722339c
Track structures
2012-03-24 17:10:45 +01:00
517b2ffadb
Merge remote-tracking branch 'peterix/master'
2012-03-24 16:30:07 +04:00
0c7fc233bd
Support resize/erase/insert for containers, and allow any index in BitArray.
2012-03-24 16:28:53 +04:00
8a847dbaba
Tweaks and cleanups
...
Removed t_virtual.
Made lua use C++ compiler
Removed many silly exception types from Error.h and renamed the rest.
Removed Brush classes from tiletypes plugin.
2012-03-24 12:13:51 +01:00
d865d54a90
Split LuaWrapper.cpp into two files.
2012-03-24 13:25:10 +04:00
053bfe345c
Implement allocation and copy for c++ objects in the lua wrapper.
2012-03-24 12:43:53 +04:00
90de6a1b62
Track submodules
2012-03-23 22:59:40 +01:00
2b1f8aa2bb
Add a _field method that returns refs to struct and container items.
...
Hack: allocate ad-hoc pointer identities as full lua userdata.
2012-03-23 12:55:29 +04:00
6b2006361d
Add a _displace method that implements offsetting a pointer by an int.
2012-03-23 11:54:59 +04:00
78437310d0
Add a sizeof method/function to retrieve object/type size and address.
2012-03-23 11:30:54 +04:00
ccc8fac166
Get rid of the write mode field table in metamethods.
...
Two separate tables can be confusing, e.g. if a builtin field
overrides a writable custom one only in the read table.
2012-03-23 10:56:29 +04:00
ead28db451
Remove the return type from lua_read, because it always returns 1.
2012-03-23 09:38:49 +04:00
27824642d9
Minor refactoring of container indexing and object allocation.
2012-03-22 10:56:32 +04:00
ad10303cec
Implement bitfields and add a _kind metadata field to types and objects.
2012-03-21 20:04:37 +04:00
9b78fffe92
Support containers in the lua wrapper.
2012-03-21 13:26:53 +04:00
73e138c9fd
Support ordinary struct and class fields.
2012-03-20 21:34:27 +04:00
6c661bcaa9
Add support for primitive type fields in lua wrapper.
2012-03-20 13:56:29 +04:00
dbbd9acfad
Export the type tree with enum keys to lua.
2012-03-19 20:12:27 +04:00
296d3a0af3
Skeleton type metadata for future use in lua bindings.
2012-03-19 16:59:11 +04:00
bfb226b92e
Add a few comments.
2012-03-19 11:33:30 +04:00
cf58876a8e
Need to return a value here
2012-03-18 14:42:36 -05:00
d4626f9751
Add unit professions and filtering on status.
2012-03-18 15:35:38 +04:00
e33414fa69
Export unit curse, squad, death and burrow info.
2012-03-18 13:52:39 +04:00
415ae35dff
Add RPC calls to query some global state.
2012-03-18 12:09:06 +04:00
b9ecd03fe2
Make the server suspend the core around calls unless disabled.
...
I expect the majority of methods will have to suspend the core
first thing anyway, so this will reduce typing and bugs.
Also get rid of the "me->" ugliness by splitting threadFn.
2012-03-18 11:04:15 +04:00
aa63493bb8
Add a ListSquads request.
2012-03-17 20:04:15 +04:00
3d80a1ee35
Use a more obscure serialize method to avoid recalculating byte size.
2012-03-17 17:52:23 +04:00
368b92f81f
Add a RPC call to retrieve unit info.
...
For performance reasons, material flag arrays are changed to use ints,
with enum item name mappings retrievable via a different RPC call.
2012-03-17 17:41:56 +04:00
15ccfbb086
Add a ListMaterials remote call for bulk download of basic material info.
2012-03-17 15:36:42 +04:00
58eb199036
Add many new template functions for enums & bitfields.
...
An incompatible change: ENUM_KEY_STR returns std::string now.
The old behavior is available via enum_item_key_str function.
2012-03-17 12:52:22 +04:00
14d6a62e1d
Move CoreService to a separate file.
2012-03-17 12:09:30 +04:00
3168a2ef62
Add a tiletype function to get basic shapes from shapes. Track modules.
2012-03-16 20:41:07 +01:00
976fa18d72
A number of interface tweaks in RemoteClient.
...
- Associate a default output stream with the whole connection.
If not explicitly specified in the constructor, uses stdout.
- Add methods that use this default stream to RemoteFunction.
- Add easily usable wrappers for CoreSuspend and CoreResume.
2012-03-16 14:11:46 +04:00
5464564ef6
Merge branch 'master' of git://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-03-15 20:12:01 -05:00
4d66218783
Update bprobe to print civzone subtypes
2012-03-15 20:09:56 -05:00
c72fb76316
MSVC fixage for the new socket API
2012-03-15 22:05:33 +01:00
52aca6e05a
Rename "interface" to "interfacest" and just avoid all of these MSVC problems
2012-03-15 13:00:47 -05:00
57a41a0deb
Fix indentation
2012-03-15 11:50:38 -05:00
f84b1539a8
Change to the traits representation of enum and bitfield properties.
2012-03-15 20:46:08 +04:00
e5efbc5895
Merge https://github.com/angavrilov/dfhack
2012-03-15 15:40:35 +01:00
1ac8025025
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
plugins/workflow.cpp
2012-03-15 14:43:05 +01:00
4eb4811777
Make the DF suspend lock recursive, and add RPC calls for batch suspend.
...
The idea is that if you have to execute many RPC calls, it is
faster to suspend once. The service class takes care to auto-resume
in the destructor in case the client just disappears.
2012-03-15 15:33:19 +04:00
605ee9669a
Plugin-exported functions now actually work.
2012-03-15 14:06:50 +04:00
87f925e72e
Add support for exporting functions from plugins, with example in rename.
...
TODO: test by actually calling them remotely.
2012-03-15 13:01:23 +04:00
e7851f5abd
Improve support for void RPC functions, dfhack-run, etc.
2012-03-15 11:07:43 +04:00
560e977f05
Implement trivial RPC interface for dfhack via TCP & protobufs.
...
Use it to make an executable capable of calling commands remotely.
2012-03-14 19:57:29 +04:00
c42e2ff053
Support crafts and add a couple of options in workflow.
2012-03-14 12:09:02 +04:00
a05cbcc2de
Rename the world substruct with the save directory name.
2012-03-14 10:56:30 +04:00
d75908b95c
Merge https://github.com/ClaytonHughes/dfhack
...
Conflicts:
library/Core.cpp
plugins/workflow.cpp
Just had to fix a few minor things.
2012-03-14 01:52:58 +01:00
a4ce1fff13
Update MapCache to allow decoding tiles underneath ice and constructions, and allow revflood to take those into account
2012-03-13 15:40:38 -05:00
8e933fb75e
Ignore the .rule file too
2012-03-13 12:17:00 -05:00
9079ffa4ff
Add clsocket as a dependency for dfhack lib.
2012-03-13 17:10:46 +01:00
eb4757043b
Move depends out of main library, make them (static) libraries.
2012-03-13 14:46:48 +01:00
b3f6bccdf6
Merge branch 'cleanups' of https://github.com/plaes/dfhack
2012-03-12 15:05:44 +01:00
ea8a2ad9a2
Remove references to never implemented commands...
2012-03-12 15:05:23 +01:00
4cb8995a05
Fixed script loading improperly checking for errors.
...
Also closed the file for good measure. I couldn't find any documentation that said that ~ifstream() did this.
2012-03-12 00:33:59 -07:00
445b580ad1
Added 'script' command to load DFHack scripts from file. Syntax is the same as dfhack.init / interactive.
2012-03-11 23:31:29 -07:00
db93b548db
Check for a valid plugin_shutdown function when unloading plugins
...
Fixes related segfault
2012-03-11 23:07:38 +01:00
32cc4c8928
Fix MSVC build error related to min and max macros
...
Tinythread was leaking those.
2012-03-10 20:47:10 +01:00
75113b715a
Misc fixes for warnings...
2012-03-10 16:03:11 +01:00
cff654bca6
Track structures
2012-03-10 15:51:50 +01:00
003a0f9eb8
Merge https://github.com/angavrilov/dfhack
2012-03-10 15:51:45 +01:00
50b7db982f
Fix zlib, protobuf.
...
Zlib is now found using CMake on linux and set to harcoded paths
on windows, yet uniform in use throughout the build system.
protobuf-lite now compiles under MSVC properly.
2012-03-10 15:31:46 +01:00
8cc82d5876
Make plugins accept explicit output stream references.
...
This is an incompatible change to the plugin ABI.
The Console is not thread-safe unless used indirectly
via color_ostream_proxy, so everything should use their
per-thread stream.
2012-03-10 15:55:42 +04:00
b2737e2bed
Pull out a colored text output interface out of the Console class.
2012-03-10 13:29:33 +04:00
c260aca3f1
Merge https://github.com/angavrilov/dfhack
2012-03-10 02:15:34 +01:00
75c569b097
Add some experimental message definitions to the main library.
2012-03-09 21:42:22 +04:00
edf77cf270
Link protobuf to dfhack core as a shared library.
...
- Change protobuf libraries to build as DLLs.
- Move some stream features to the lite library.
- Install the lite library and use it from dfhack.
Note that:
- A couple of protobuf headers had to be tweaked.
- The lite library is used because the full one is
absolutely incompatible with reloading plugins.
- Shutting down protobuf also can't be allowed.
2012-03-09 19:46:21 +04:00
47bbe1a3ff
Fixed up formatting, debug messages in new Windows Hotkey stuff.
2012-03-09 01:07:47 -08:00
3d1ce32785
Windows now detects hotkeys using the correct keyboard layout.
2012-03-09 00:56:09 -08:00
3598282ed7
Update readme, track df2mc and structures
2012-03-07 23:40:22 +01:00
b6df6c2eff
Track structures
2012-03-07 21:02:46 +01:00
9b071097de
Fix advtools metal-detector
...
Trader items are now inside tables, and thus not in the block
item lists. Thus it is necessary to scan the global item vector
and look up blocks by coords.
2012-03-07 18:10:53 +04:00
f83db86258
Use tile buffers!
2012-03-05 02:24:02 +01:00
a45fc82743
First pass at windowing, track df2mc, stonesense
2012-03-05 01:34:04 +01:00
6aa2a3e676
Track structures
2012-03-04 11:58:41 +01:00
99abd4102d
Merge https://github.com/quietust/dfhack
2012-03-04 11:58:37 +01:00
d33e9a9770
Sort layer materials in prospector by depth.
2012-03-03 23:18:12 +01:00
2b2c30ac43
DEEP_ANY got renamed to SPECIAL
2012-03-03 16:03:35 -06:00
7fe8762852
Get rid of Simple namespace, Gui module is now a namespace.
2012-03-03 14:38:24 +01:00
022822277d
Fix the ugly Materials code...
2012-03-01 01:52:13 +01:00
2682c54fce
Fix horrible errors and make MSVC shut upt about non-issues.
2012-03-01 01:29:55 +01:00
c6fd508ee3
Fix possible source of vile errors.
2012-03-01 00:33:11 +01:00
a322b3ad87
Track structures
2012-02-29 17:44:51 +01:00
f0fc0d4428
Bump version to 0.34.03-r1, update docs to list new plugins.
2012-02-28 22:30:55 +01:00
a13717212a
Track structures
2012-02-28 19:05:55 +01:00
d1a1c790ec
Paint DFHack in corner if supported.
2012-02-28 18:19:13 +01:00
95ac3db542
Fix normal hooks.
2012-02-28 12:59:02 +01:00
731472a478
Add eggy hooks (linux only for now)
2012-02-28 03:37:56 +01:00
f8721c88b5
dev version. update structures, stonesense
2012-02-27 20:10:31 +01:00
8afafd0430
Get rid of ntdll, update stonesense
2012-02-25 22:59:32 +01:00
75bec0dfb2
fix spatter objects
2012-02-25 21:17:45 +01:00
ad7b9d42a1
Add a command for swapping body with another units in adventure mode.
...
Based on dfusion code, with lots of safety checks added. Supports two
swap modes: transient and permanent; the former does a minimal change
and is intended for managing companion inventory. The permanent one
performs all known actions necessary to turn it into the real adventurer.
Note: the transient mode is a hack and may cause the game to crash
if not reverted while within range of the real adventurer unit.
2012-02-25 17:08:05 +04:00
1299b0d4c6
Don't compile Lua on UNIX
2012-02-23 13:49:07 +02:00
6696e79838
Disable 34.01 symbol tables
2012-02-23 09:02:10 +01:00
2b761e450f
Add the init file to builds, mention it in readme.
2012-02-23 08:57:11 +01:00
2371b93b3d
move sortable to top level
2012-02-22 23:22:41 +01:00
390859dd98
Update xml
2012-02-22 22:58:33 +01:00
58e3813d56
Fix more MSVC fail, make console recognize 'man' command.
2012-02-22 19:54:07 +01:00
a9c9ac98fe
Silence some MSVC warnings.
2012-02-22 19:28:40 +01:00
15cc08debc
Fix the fail.
2012-02-22 19:02:06 +01:00
0807baf0c0
Merge https://github.com/mikestewart/dfhack
2012-02-22 15:22:19 +01:00
8ee27e182a
Hidden weather command raw value override
2012-02-22 15:21:29 +01:00
baea253578
Merge remote-tracking branch 'upstream/master'
2012-02-21 23:31:53 -08:00
14b471a459
Add ability menu/area map width reading and writing to the Gui module, and use the new information in follow to properly center the screen regardless of menu configuration. Also general fixing and cleanup in follow.
2012-02-21 23:30:44 -08:00
34c9c2d663
Fix stonesense, MSVC fail
2012-02-21 18:30:31 +01:00
2cd2ee9b0c
New plugin interface
2012-02-21 18:19:17 +01:00
0b9e849096
Update submodules, sort 'ls' output.
2012-02-21 15:21:50 +01:00
931121e5fd
Update structures
2012-02-20 17:55:33 +01:00
02e486be88
Support the new unitlist screen; it's same as joblist, but with pages.
2012-02-20 17:53:39 +04:00
80cedd2ff8
Fix header includes, update structures.
2012-02-20 11:42:40 +01:00
7c7cf0b302
Don't throw exceptions on dummy global-address elements.
2012-02-20 08:30:33 +01:00
33f77c8837
Merge https://github.com/quietust/dfhack
2012-02-19 20:28:08 +01:00
252895708f
Fixage.
2012-02-19 20:27:44 +01:00
27e3e0f2c2
Update submodules
2012-02-19 20:08:29 +01:00
d394dc406b
Update t_building, change subtype into a union of all possible subtypes (depending on type)
2012-02-18 11:34:52 -06:00
1511a6b7ed
Use hexadecimal numbers in tilesieve
2012-02-18 15:07:55 +01:00
fa6ec63535
Add zoom to kittens, fix tilesieve.
2012-02-17 05:30:34 +01:00
28059a7f35
Tilesieve devel tool
2012-02-16 16:22:05 +01:00
1bf5080828
Fixage. Runs with 34.01
2012-02-15 21:35:44 +01:00
448e270421
Merge https://github.com/quietust/dfhack
...
Conflicts:
plugins/mapexport/mapexport.cpp
2012-02-14 09:59:33 +01:00
bdbfbf5988
Fix catsplosion.
2012-02-14 09:37:30 +01:00
2fd2e3dce2
Get rid of t_effect_40d and EFFECT_TYPE - they're in the XML now, and they're actually correct too
2012-02-13 21:56:47 -06:00
2ddd3df3a8
When searching for tile types, only require candidate tile to match variant or special if it actually has them
2012-02-13 20:32:41 -06:00
b152a40e83
Fix remaining issues
2012-02-13 19:56:55 -06:00
d15d38d536
Finish conversion, fix compile errors
2012-02-13 19:17:38 -06:00
d0a8c2edd8
Move TileTypes to XML, part 1 - a bunch of stuff is now broken
2012-02-13 16:56:33 -06:00
f600928ec1
Move catsplosion, tweak for build targets under MSVC.
2012-02-13 17:43:41 +01:00
9f43d61c2c
Fix MapCache crash when in Arena mode
2012-02-13 09:56:35 -06:00
e39852ff2e
Make BitArray(unsigned) treat the argument as the number of bytes.
2012-02-12 18:06:00 +04:00
1047c2517d
Add size-defining constructors for BitArray.
2012-02-12 17:44:19 +04:00
c04a140713
Add a new DfArray class to match generated headers.
...
Also, add working assignment and copy constructor to BitArray, and
change the unsafe conversion to int from an operator to a method.
2012-02-12 16:44:35 +04:00
ed53ee7031
Update to use the new symbols file.
2012-02-11 19:24:44 +01:00
8527547cbe
Merge branch 'master' into purge
...
Conflicts:
library/DataDefs.cpp
2012-02-11 18:48:17 +01:00
f469fab1e6
Use globals defined by the latest codegen.
2012-02-11 16:27:12 +04:00
aee5efe7c0
Make it run on Windows, re-added more missing globals to memory.xml
2012-02-10 02:35:51 +01:00
952f621ee2
Synchronize with df-structures
2012-02-08 22:35:22 -06:00
8f680dcf94
Make it build and run on linux (no stonesense, df2mc, dfusion)
2012-02-09 03:07:26 +01:00
f7d8635be1
Remove fat from memory.xml, simplify memory.xml loading, break
...
everything.
2012-02-08 13:22:42 +01:00
0d11d1b79c
Synch with structures changes
2012-02-07 15:37:21 -06:00
0a5ee01f6e
update structures
2012-02-06 10:04:58 +01:00
8f1a2ebf7f
Added missing keybinding mention to 'ls', DFusion hotfix.
2012-02-06 04:47:13 +01:00
0c79682fc5
Update structures
2012-02-06 01:35:07 +01:00
e7f8e539f7
Update structures
2012-02-05 20:51:15 +01:00
2b22b0b336
Make dwarf export optional. Update structures.
2012-02-05 20:16:00 +01:00
1bcf96f4e8
Update structures
2012-02-05 19:55:32 +01:00
ec5f3cc4b3
Update fixpositions to match the new data definition naming.
2012-02-05 16:13:19 +04:00
e51e4f6bd2
More docs work.
2012-02-05 06:02:44 +01:00
4b3a2bfe05
Merge.
2012-02-03 23:29:05 -08:00
2ff994c18f
Make perl executable tweakable.
2012-02-04 03:43:14 +01:00
878bc3d3a1
Implement pre-embark estimate in prospector.
...
Requires careful tuning of the vein density computation.
2012-02-02 22:14:49 +04:00
22aeb6e2ac
Added linkage to libdl, fix for mode.
2012-02-01 04:12:15 +01:00
7d55b84545
Merge remote-tracking branch 'upstream/master'
2012-01-31 11:45:20 -08:00
e5b1433d44
Update structures.
2012-01-31 18:52:02 +01:00
9afcea3deb
In all loops that iterate across a vector, use a size_t as the index
2012-01-31 10:55:38 -06:00
09f197fa6d
Fixed mapexport build on Linux.
2012-01-31 08:42:25 -08:00
a82f4c9138
Cleanup code to get rid of MSVC warning C4482
2012-01-31 10:17:27 -06:00
dcc02506b7
Merge remote-tracking branch 'quietust/master'
2012-01-29 12:05:30 -08:00
3dece3395d
Merge remote-tracking branch 'upstream/master'
2012-01-29 12:04:33 -08:00
70454842ae
Add missing direction indicators to smooth wall tiles, and cleanup spacing
2012-01-29 11:38:34 -06:00
e5be2c75c2
Merge remote-tracking branch 'q-github/master'
2012-01-29 14:14:05 +04:00
05c37af4c9
Mapexport now puts stuff out to a binary file compressed with zlib. Added liquid type and flow size to output as well.
2012-01-28 23:55:42 -08:00
bd26c54259
Merge remote-tracking branch 'quietust/master'
2012-01-28 13:33:26 -08:00
b07d3b25b5
Merge upstream/master
2012-01-28 13:32:48 -08:00
8a4740c479
Make all "origin" fields strongly typed, and fix building.origin to actually be meaningful
2012-01-28 14:12:41 -06:00
9e40228767
Adjust Maps typedefs a bit
2012-01-28 13:54:59 -06:00
fa4fb4b407
Modify a number of commands to use CR_WRONG_USAGE for displaying help.
2012-01-28 16:03:56 +04:00
69b8f168cc
Improve Translation::isValid() - make sure world exists
2012-01-27 22:01:59 -06:00
34f9d98d45
Simplify TranslateName a bit using a helper function
2012-01-27 21:46:52 -06:00
116e5d60be
Update Translation::TranslateName to include the first name, plus have it follow the init setting for nickname display (in Dwarf mode)
2012-01-27 21:36:01 -06:00
b89cd43b85
More work on getting the map exporter up to speed.
2012-01-27 17:32:52 -08:00
ccad6efeb8
Remove UTF-8 BOMs
2012-01-27 09:47:14 -06:00
5521459fc1
"unknown1" was renamed to "body_info"
2012-01-27 09:41:51 -06:00
1d7ed14442
Merge https://github.com/quietust/dfhack
...
Re-add some get* forms of module calls.
Conflicts:
plugins/mapexport/mapexport.cpp
2012-01-27 06:27:57 +01:00
d5d4875532
Make things work properly.
2012-01-27 05:54:26 +01:00
be892beba9
Update materials module to match XML changes
2012-01-26 21:32:47 -06:00
fe34e07d2b
Re-add the ability to request simplified copies of Constructions, Engravings, and Plants; also fix the "isValid" checks for those modules to actually be meaningful
2012-01-26 20:29:59 -06:00
cfca04f2d2
Cleanup TileTypes
...
* Group tiletypes by 0x10 instead of by 10
* Change tile type parameters to use int16_t consistently
* Various description fixes
2012-01-26 10:38:18 -06:00
0375be549c
Merge https://github.com/mikestewart/dfhack
2012-01-26 05:37:50 +01:00
850ede3e72
Sync structures.
2012-01-26 05:36:35 +01:00
3c60b43a38
Fix "origin" field on mapblock40d to actually be correct
2012-01-25 07:57:11 -06:00
902e0c4d90
Strip out old offsets from Gui module and use df::global vars where available
2012-01-24 22:18:21 -06:00
9a683ffda4
Switch some World module stuff to read out of appropriate df::global vars, and fix setPauseState to only write a byte instead of a dword
2012-01-24 21:51:17 -06:00
26730dc6c2
Kill the Constructions module
2012-01-24 16:11:48 -06:00
e68cdee95b
Merge remote-tracking branch 'quietust/master'
2012-01-24 12:27:38 -08:00
8861e93848
Kill the Vegetation module, replacing it with the same 3 simple methods used in Engravings
2012-01-24 12:02:12 -06:00
6d1af090c5
Tweak Engravings.h
2012-01-24 11:57:47 -06:00
f8ce959402
Kill the Engravings module
2012-01-24 11:53:49 -06:00
cc7c7795a1
Kill the Units module, and add another pair of methods to the Items module to simplify some things
2012-01-24 11:32:34 -06:00
02d75e2c94
Building module is gone, so this function doesn't exist anymore
2012-01-24 10:59:26 -06:00
a3904b99dd
Remove bad assert from Translation, as well as <cassert> from other modules that don't use it
2012-01-24 10:57:25 -06:00
466bf89578
Goodbye, Translation module
2012-01-24 10:54:12 -06:00
174d9d0739
Tweak showmood, add a few validity checks, commit a dfhack.init example.
2012-01-24 15:36:30 +04:00
6adadb396e
df::tool_uses is now implicitly int16_t, so no more enum_field<> here
2012-01-23 19:40:02 -06:00
031119ac73
Made mapexport build with latest Material changes.
2012-01-22 15:47:39 -08:00
0d79fd9b15
Merge remote-tracking branch 'quietust/master'
2012-01-22 15:31:34 -08:00
7f23c322a2
Cleanup
2012-01-21 19:24:58 -06:00
ccf22bed10
Replace df_plant with df::plant - this leaves the Vegetation module a bit empty, but I'll leave it in case we decide to add something new there
2012-01-21 17:54:57 -06:00
debeebb7c4
Merge remote-tracking branch 'quietust/master'
2012-01-21 11:26:12 -08:00
d2c78646ea
t_creaturecaste shouldn't be using t_attrib, because those AREN'T actual attribute values, just the PHYS/MENT_ATT_RANGE values from the raws
2012-01-21 13:24:38 -06:00
7b2835e2a9
Get rid of df_name
2012-01-21 13:12:40 -06:00
8052305c2e
Cleanup the Units module
2012-01-21 13:03:39 -06:00
118e5c6617
Major cleanup of Materials modul, precursor to eventually nuking it
2012-01-21 10:12:26 -06:00
d504479fc2
Merge https://github.com/angavrilov/dfhack
2012-01-21 09:59:54 -06:00
d9c4f259a0
These will become necessary shortly
2012-01-21 08:59:19 -06:00
b0cda1526e
Adjust FOR_ENUM_ITEMS to account for ENUM_LAST_ITEM being inclusive now.
2012-01-21 18:50:44 +04:00
2449b80010
Update to match the data definitions.
2012-01-21 17:18:53 +04:00
df08914549
Better fix for building protobufs with C++0x turned on.
2012-01-20 16:21:50 -08:00
bf60f5975a
Cleaned up the protobuf and mapexport build scripts a lot, and added two more simple proto files to store map geometry information.
2012-01-20 11:21:29 -08:00
9b0b0d53f9
Merge remote-tracking branch 'quietust/master'
2012-01-20 09:47:32 -08:00
941c643b5c
Cleaned up the protobuf build a bit, and made git ignore files generated in doing so. Fixed building mapexport on Linux by forcing CMake to create a directory for protobuf output files.
2012-01-20 09:17:08 -08:00
1b419313f4
Merge https://github.com/angavrilov/dfhack
2012-01-20 10:40:25 -06:00
80292bd49e
Update Maps to match the new geo_biome definitions.
2012-01-20 20:27:39 +04:00
67f60a07bd
Fix crash bug in dfprobe
2012-01-20 08:30:09 -06:00
cc510a2c4b
Replace DFCoord with df::coord and df::coord2d.
2012-01-20 14:28:00 +04:00
c0a0702882
Improve error handling within Maps module - only throw exceptions if there's no meaningful return type
2012-01-19 22:11:43 -06:00
e7ecda1434
Kill the Maps module
2012-01-19 21:44:17 -06:00
1e59811e65
Fixed check for old GCC versions.
2012-01-19 14:55:10 -08:00
494a4202df
Added Google Protocol Buffers to the library dependencies folder (though nothing yet depends on it). This definitely works in Linux, but needs checking in Windows.
2012-01-19 14:44:01 -08:00
e7dcd4c66a
Fix stupid typo
2012-01-19 14:57:55 -06:00
4bb724cd6c
Significant cleanup of Maps module - next step will be to kill it properly
2012-01-19 14:11:52 -06:00
e2d7359bdd
Add the gps global to Memory.xml.
2012-01-19 17:26:21 +04:00
7db467a740
Update code to accomodate the new coord/coord2d/coord_path structs.
...
Also replicate the methods of DFCoord.
2012-01-19 14:30:22 +04:00
35ad84c58a
angavrilov changed general_ref_type to be all uppercase
2012-01-18 08:26:08 -06:00
fd653a0227
Kill the Items module
2012-01-16 22:12:58 -06:00
9d8c67b710
Kill the Kitchen module (which was never really a proper module to begin with)
2012-01-16 21:22:42 -06:00
a9eb555b99
Get rid of t_itemimprovement (wasn't even used)
2012-01-16 20:41:09 -06:00
7c5835d318
t_itemref -> df::general_ref
2012-01-16 20:40:29 -06:00
c18619520d
df_contaminant -> df::contaminant
2012-01-16 20:18:40 -06:00
64b55acf37
df_item -> df::item, t_itemflags -> df::item_flags
2012-01-16 20:16:16 -06:00
97bae19c13
Update BitArray to automatically grow whenever setting/toggling bits beyond the end
2012-01-15 18:08:35 -06:00
e82055986e
Only use #include <> for system libraries - for everything else, use ""
2012-01-15 14:54:14 -06:00
d972b07d57
Merge https://github.com/quietust/dfhack
...
Conflicts:
plugins/autodump.cpp
plugins/cleaners.cpp
2012-01-15 19:51:34 +01:00
bcb51d8ff7
Use the announcement API to report starting and stopping workflow jobs.
2012-01-15 15:39:20 +04:00
0f56611edc
Support showing announcements, as suggested by Q.
2012-01-15 15:19:20 +04:00
a31542862a
Add utility functions to retrieve the selected job/unit/item.
...
Units can be selected via 'u', 'j', 'v' and 'k'; full-screen
unit details view not supported.
Items can be selected via 't', 'k', 'v'->inventory.
Also, when viewing a container item full-screen, the selected
contained item or unit is returned; never the container itself.
The api is used in rename to allow setting nicknames for
arbitrary units, including animals and enemies.
2012-01-14 19:31:43 +04:00
53e9a1659b
Add automatic drybucket and melting to workflow.
2012-01-12 20:07:53 +04:00
555183cb25
Remove unreferenced variables
2012-01-11 10:57:05 -06:00
6d2ce7b8a9
Add default return value to MaterialInfo::matches
2012-01-11 10:50:38 -06:00
9a86087db5
Add timeouts when a job is cancelled, and color the command output.
2012-01-11 20:04:04 +04:00
24576ffe19
Silence annoying warning in MSVC
2012-01-11 08:54:54 -06:00
cc2ac0b04f
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-01-10 19:50:13 +01:00
1d4b9ac318
Track structures
2012-01-10 19:47:48 +01:00
7f5aa4de62
Support the most important job types in workflow.
2012-01-10 17:23:37 +04:00
571498ea21
Vermin tweaks.
2012-01-10 00:45:43 +01:00
50386f66a3
Update structures and implement modifying the job_item item type.
2012-01-09 16:20:17 +04:00
ea790f1346
Move a few functions into the core, and add some more.
2012-01-08 20:02:12 +04:00
64a9a49ec0
Merge remote-tracking branch 'origin/master'
2012-01-08 16:19:58 +04:00
22071e2d51
Update data defs.
2012-01-08 16:10:38 +04:00
da2b00d480
Sync structures
2012-01-08 07:02:05 +01:00
8a46386502
Dissolve vermin module.
2012-01-08 06:59:52 +01:00
72016d9188
Buildings aren't a module anymore, fix probe segfaults.
2012-01-08 02:22:13 +01:00
87009c0535
Add a plugin that protects specific repeat jobs from disappearing.
...
If they do disappear, they are re-added in a suspended state.
2012-01-07 21:47:23 +04:00
07ad9ad972
Add persistent data storage in fake historical figure names.
2012-01-07 19:21:31 +04:00
f5e121a196
Move a bunch of stuff from the jobutils plugin into the core.
2012-01-07 19:21:07 +04:00
0e90e6b78e
Support multi-valued enum attributes.
2012-01-06 22:08:09 +04:00
a2cad00dbb
Remove GetCustomWorkshopType, custom workshop types are now saner.
2012-01-06 01:08:30 +01:00
e520a1d43b
Fix building coord variables.
2012-01-06 00:24:00 +01:00
756b8131c1
Small fix in Buildings, update stonesense.
2012-01-06 00:09:49 +01:00
72a4698968
Merge https://github.com/angavrilov/dfhack
2012-01-05 23:54:33 +01:00
8e993fedc3
Update df structures.
2012-01-05 23:51:47 +01:00
78a98de37e
Fix MSVC builds, break buildings :D
2012-01-05 23:39:14 +01:00
687245abd9
Allow setting job item materials.
2012-01-05 22:04:05 +04:00
4a59690968
Don't print empty parentheses without any flags to fill them.
2012-01-04 20:22:56 +04:00
284009e873
Add a hotkey command to duplicate jobs in workshops.
2012-01-04 19:39:38 +04:00
99dda069de
Update data definitions.
2012-01-04 18:46:39 +04:00
86464b99cc
Remove DfVector, break MSVC builds until further notice.
2012-01-04 01:45:11 +01:00
1d1cd63800
Implement printing job details.
2012-01-03 22:56:05 +04:00
f8814909a9
Move the MaterialInfo class to the main library.
2012-01-03 19:25:55 +04:00
fb736a8556
Support more ways to binsearch in a vector.
2012-01-03 13:07:49 +04:00
326c58f793
Add a plugin to tweak inorganic materials in jobs.
...
It also auto-seeks in the build item list if used in that context.
2012-01-02 18:46:24 +04:00
bfcaca9266
Update xml defs with more ui info.
2012-01-02 15:18:23 +04:00
6476d61e59
Update structure definitions & add the fixwagons plugin from Q.
2012-01-01 23:05:45 +04:00
3f9e1b0c2b
Update xml
2012-01-01 04:26:22 +01:00
6029949ca3
Update library/xml so things actually build.
2012-01-01 03:46:36 +01:00
f2a69188ea
Use submodule for memory structure definitions (df-structures).
2012-01-01 03:34:29 +01:00
52dfa842cc
Add missing MiscUtils.cpp
2011-12-31 13:14:08 +01:00
f35cdb84cd
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
library/Core.cpp
library/PluginManager.cpp
library/include/Core.h
library/include/PluginManager.h
library/modules/Gui.cpp
plugins/stockpiles.cpp
2011-12-31 13:09:12 +01:00
9db20bd84d
Header changes/cleanup.
2011-12-31 12:48:42 +01:00
b652ec4132
Implement context-sensitive keybinding support.
...
Allow defining commands with guard conditions, and binding
one or more commands to alphabetic and function keys. When
the relevant key is pressed, the first listed command with
successfully evaluated guard is chosen.
For consistency, the guard is also checked when the command
is invoked from the console; this requires suspending the
core inside PluginManager, before invoking plugin code.
2011-12-31 13:25:46 +04:00
1284b30f79
Merge https://github.com/angavrilov/dfhack
2011-12-31 01:40:08 +01:00
2222757e77
Implement context-sensitive keybinding support.
...
Allow defining commands with guard conditions, and binding
one or more commands to alphabetic and function keys. When
the relevant key is pressed, the first listed command with
successfully evaluated guard is chosen.
For consistency, the guard is also checked when the command
is invoked from the console; this requires suspending the
core inside PluginManager, before invoking plugin code.
2011-12-30 23:25:50 +04:00
4aa77f5530
Execute commands from the dfhack.init file on startup.
2011-12-30 23:11:34 +04:00
b71e577771
Allow specifying parameters in hotkey commands.
...
Now that hotkeys can be set to arbitrary strings, tokenize them.
2011-12-30 18:27:55 +04:00
53346328e8
Notify plugins about game being loaded or unloaded.
...
As a test, make seadwatch deactivate on these events.
2011-12-30 18:12:15 +04:00
1a88df201c
Traits are active if MORE than 10 away from 50
2011-12-30 10:20:16 +08:00
e6ff6b04fc
Merge https://github.com/warmist/dfhack
2011-12-30 03:12:29 +01:00
298e2fe92d
Add a plugin to rename squads and hotkeys (without the 9 char limit).
2011-12-29 17:37:07 +04:00
5173a1235b
Fix plugin reloading.
2011-12-29 16:46:08 +04:00
b14e2a0c0d
Update the XML definitions.
2011-12-29 16:46:08 +04:00
d513e75365
Use the updated code generator with support for vtables & constructors.
2011-12-29 16:46:01 +04:00
2643e0c5a7
Merge branch 'master' of git://github.com/peterix/dfhack
2011-12-28 22:49:31 +02:00
51dae5a5dc
Fix for minor MSVC error.
2011-12-24 14:34:10 +01:00
e9f9f9b92e
Merge https://github.com/angavrilov/dfhack
2011-12-24 14:27:58 +01:00
59c32b1ee9
Some changes required on windows.
2011-12-24 14:27:35 +01:00
2eb56d0480
Make strongly-typed 'any virtual class' pointers optional.
...
It seems they might not work properly on msvc.
2011-12-24 17:17:01 +04:00
81ad287c06
Generate very simple static functions to find objects in global vectors.
2011-12-24 16:22:10 +04:00
dc78e99f75
Added getKeys to OffsetGroup (for easy lua access to all things that memory.xml has)
2011-12-24 13:53:59 +02:00
79ac2a781a
Add infrastructure necessary to use the generated headers.
...
As a usage example, allow toggling water level display and idlers,
and implement a ui tweak for easily copying stockpiles.
Also disable df2mc by default - default options shouldn't
require anything not in the base package.
2011-12-24 14:51:58 +04:00
0b5a470a38
Add header generation from xml.
2011-12-24 14:38:28 +04:00
b36e5ac248
Add missing files.
2011-12-07 20:50:37 +01:00
647916e109
Graphic module
2011-12-07 20:37:09 +01:00
f7d78539d3
Renaming Creatures to Units
2011-12-02 10:56:40 +01:00
9dba6003bc
Small Items tweak.
2011-11-30 07:42:59 +01:00
57b5ed8fa7
Made invalid tile types really invalid, license and unused depends cleanup.
2011-11-25 18:54:50 +01:00
44dad25690
No nullptr, propector -> prospect
2011-11-14 09:24:36 +01:00
7e475970fb
Fix crash when using load, unload and reload commands.
2011-11-07 10:55:18 +01:00
2c27119d85
Set CXXFLAGS properly to ensure compatibility with i686 systems.
2011-11-06 21:16:16 +01:00
9968d387a0
Add zlib as windows depend for df2mc, fix md5 on windows.
2011-11-06 03:26:24 +01:00
9be4092c7f
creature thoughts
2011-11-06 01:22:11 +01:00
9dca825ef7
Fix include in md5 (memory.h is obsolete).
2011-11-04 19:24:04 +01:00
da21fa1d79
MATERIAL_SOIL tweak
2011-11-04 18:51:52 +01:00
321f9e589e
Switched out md5 implementation for a different one.
2011-11-04 09:33:33 +01:00
af46b262b5
More init hardening.
2011-11-04 09:08:29 +01:00
0f42dee97a
More material changes.
2011-11-03 05:01:25 +01:00
4f0695a6d5
Messing with materials.
2011-11-03 04:30:59 +01:00
a6eea1adfd
More checks added to MD5.
2011-11-03 02:40:49 +01:00
f0417e12dd
Hardening.
2011-11-01 13:06:27 +01:00
98cab0e9ad
Really fix linux Console.
2011-10-31 04:17:35 +01:00
84e1a95205
Fix race condition in Linux version of Console.
2011-10-31 03:34:22 +01:00
7f6fa2a008
Add an enum for base material types.
2011-10-30 21:32:43 +01:00
063894276c
Tiny type fixes for spatter veins, updated df2mc.
2011-10-30 15:25:29 +01:00
dc12c41d86
Fix kitchen exclusion class not being exported.
2011-10-30 03:26:50 +01:00
a29bb4578f
Move kitchen exclusion module methods to a source file.
2011-10-30 03:20:54 +01:00
a3a1629521
Fix seedwatch some more.
2011-10-30 02:52:25 +01:00
4688f6557e
Fix problem with magic numbers in fastdwarf.
2011-10-28 06:22:07 +02:00
e74aae6f3e
Rename some plant material variables
2011-10-28 05:25:49 +02:00
bfc8df3005
Added plant raw struct
2011-10-28 04:40:35 +02:00
61be3413e3
Make seedwatch work on linux, still with ugly hacks.
2011-10-27 03:31:13 +02:00
335ad28fe5
Add item contaminants vector to df_item, fixed up cleanitems plugin to use it.
2011-10-27 01:08:59 +02:00
c8cd307bcf
Added missing method stubs to df_item.
2011-10-26 23:47:45 +02:00
1f0e91c3d0
Add enum for item types.
2011-10-26 23:12:20 +02:00
b545de7f43
Items refactor. readItem turned into copyItem, most Items methods now accept plain df_item * instead of the copies.
2011-10-26 22:18:13 +02:00
866b63f567
More of the items overhaul
2011-10-25 13:30:41 +02:00
2adf1d22eb
Item description method found!
2011-10-25 05:31:37 +02:00
04495a304c
Kill item variable accessors. YES.
2011-10-25 04:48:06 +02:00
998d85919f
Windows offset for save name, some tweaks, updated stonesense submodule to current.
2011-10-23 22:23:54 +02:00
a83d9fa944
Added mouse position and designation coord, along with a 'trackpos' command for kittens plugin.
2011-09-26 03:39:27 +02:00
83ae8d6c12
Creature likes (at least the structures are back), malloc wrapper that sets memory to 0xCC.
2011-09-25 01:29:55 +02:00
dc81367a68
Gems are now properly detected in prospector. Nuked some legacy garbage.
2011-09-24 06:48:06 +02:00
71de950919
Possible creature variables
2011-09-21 21:48:54 +02:00
1df71d2b7a
More tweaks related to creatures, murder implication flag for items/corpse pieces.
2011-09-21 13:47:12 +02:00
dca4c43b0b
Creatures module rewrite
2011-09-18 13:49:10 +02:00
d47e9b35a0
Update stonesense, fix small text alignment error.
2011-09-04 14:16:12 +02:00
e48f8af9a8
Remove stray include.
2011-08-31 14:41:46 +02:00
e5f0c7637e
Fixes to help/readme entries related to digcircle.
2011-08-27 15:12:03 +02:00
b173a59a42
Change < to " for dfhack/BitArray.h include
...
Unchanged, I got and error when building in MSVC++ 2010 Express
Not sure if line endings are UNIX as online edit from Windows machine
2011-08-23 10:57:37 +02:00
90163c4be5
Added includes for <maps> and <vector>
...
Without, I got errors when building in MSVC++ 2010 Express
Not sure if line endings are UNIX as online edit from Windows machine
2011-08-23 10:48:28 +02:00
4922be0a75
Circle dig designation tool.
2011-08-22 15:18:35 +02:00
b1868f802c
Make autodump fix the block-local item ID vectors.
2011-08-21 23:02:05 +02:00
d2d4ce898d
Added weather plugin info to readme, option to make the console not catch 'CTRL+C' on linux.
2011-08-18 22:09:30 +02:00
09cb6a6828
Added exporatory mining patterns tool.
2011-08-17 13:26:03 +02:00
03e3e9002b
Linux debug...
2011-08-16 23:39:18 +02:00
a0f99ef707
Many tweaks to plugins, reorganized the build system and removed more cruft.
2011-08-14 08:42:21 +02:00
81e6bce92c
Command history separated from Console.
2011-08-13 14:42:09 +02:00
d93032de3b
Fix formatting in Core.cpp
2011-08-07 08:41:46 +02:00
fedb6150f4
Merge https://github.com/warmist/dfhack
2011-08-06 21:00:54 +02:00
cb93b5542e
Fix problem with running interactive commands from hotkeys.
2011-08-06 04:37:29 +02:00
4d6ad9e073
A whole bunch of fixes for crash bugs.
2011-08-05 05:02:36 +02:00
be358ec1de
Ported deramp, cleanowned and cleartask tools.
2011-08-05 00:41:31 +02:00
4b9786f8af
Thread safety for void* sharing part of DFHack::Core
2011-08-04 22:33:54 +03:00
9985b5de0f
DFHack::Core modification: added a way to share void* between plugins and/or plugin unloads.
2011-08-04 22:00:21 +03:00
6cc66d3434
Merged grow and immolate tools into plants plugin.
2011-08-02 02:21:25 +02:00
b0659224fa
Fix windows build.
2011-08-01 06:30:29 +02:00
fa970fc8fa
Hotkey commands work with TEXT mode (limited).
2011-08-01 04:40:23 +02:00
331ada8f91
Don't take over console in TEXT mode.
2011-08-01 03:31:52 +02:00
a36d8b0619
Merge https://github.com/warmist/dfhack
2011-07-31 23:29:34 +02:00
262e915b93
Make building DFusion optional.
2011-07-30 22:08:24 +02:00
9cf69164ed
BitArray implementation, now used in Maps for the flags.
2011-07-30 16:47:49 +02:00
a9a3a3ff5f
Merge branch 'topic_tools'
2011-07-28 02:36:25 +02:00
bc23cc9eca
Made Process::setPermisions functions, to set memory page's permisions
2011-07-28 01:00:12 +03:00
2a95a4edf2
Windows part of mutex rewrite.
2011-07-27 14:22:37 +02:00
2470e564a9
Linux-side of threading function rewrite. Windows=broken.
2011-07-27 05:59:09 +02:00
8dec3546a3
More plugin work
2011-07-26 11:01:16 +02:00
d65f5596cb
Ported mode, probe. Some changes required for that.
2011-07-25 10:14:58 +02:00
a8ff3d9d48
Merge pull request #116 from matthew-cline/TOPIC-items
...
Improved Items module and itemhacks plugin
2011-07-25 01:10:07 -07:00
109f34cd6e
Improved Items module and itemhacks plugin
...
Items module:
* Identified flags for "owned by hostile" and "owned by trader".
* Identified an unknown uint32_t field as being the item age.
* Added and documented ClassNameCheck for more item ref types, though
they aren't used yet (other than to mark that item ref class as a
"known" class).
* Added method to get list of an item's unknown item ref classes.
* Made all unknown flags have name 'unk#', instead of some also having
the name 'u_ngrd#'.
Itemhacks plugin:
* Folded second command into "dumpitems unknown", which will list
any items which have the unknown vector field non-empty (which seems
to be associated with tasked items).
* "dumpitems unknown" will also dump any item with a set unknown flag
or with item refs of an unknown class.
2011-07-24 21:35:50 -07:00
41130cb613
ClassNameCheck tracks class names used
...
Each time the ClassNameCheck constructor is called it adds to the list
of class names given to it, which can later be retrieved by a class
static method.
2011-07-24 21:24:34 -07:00
bd9643c8cc
Merge branch 'dfapi'
...
Conflicts:
CMakeLists.txt
library/DFProcess-linux.cpp
library/include/dfhack-c/modules/Creatures_C.h
library/include/dfhack/modules/Maps.h
library/modules/Creatures_C.cpp
2011-07-23 17:29:05 +02:00
6b6eed34cc
Merge https://github.com/zilpin/dfhack
2011-07-23 17:08:15 +02:00
97ee2a2a39
Merge pull request #95 from matthew-cline/TOPIC-pregnancy
...
creatures: read and write pregnancy counter
2011-07-23 08:07:34 -07:00
caf6f881df
Minimize notes module.
2011-07-23 03:25:42 +02:00
35cf108040
Fix up material color names and basic flag array type in Materials.
2011-07-22 03:54:09 +02:00
e00a4e8888
Fix ore/gem sorting.
2011-07-22 03:00:56 +02:00
7325808c98
Fixes to materials.
2011-07-22 02:44:36 +02:00
131c32494a
Added DF material structs reversed by Quietust
2011-07-21 22:37:02 +02:00
86577d4f8a
Notes module
...
Gets a vector of pointers to note structs
2011-07-20 18:26:52 -07:00
bde3616015
Merge pull request #110 from matthew-cline/TOPIC-inorganic
...
More info on inorganic materials
2011-07-20 12:35:58 -07:00
873cbd8388
Make 'die' plugin a builtin, made the console interaction less confusing.
2011-07-20 20:58:19 +02:00
6631f97a6a
More info on inorganic materials
...
Get value, wall tile, boulder tile, smelting info and strand extraction
info for inorganic materials. Prospector uses this to separete out vein
materials into ores, gems and other.
Offsets provided for both Linux and Windows, but only tested on Linux.
2011-07-20 06:18:50 -07:00
0defcc9889
Making Items a bit more sane. It's still using Accessors though.
2011-07-20 10:41:13 +02:00
3d5169901c
minor bug fixes
2011-07-18 16:34:35 -04:00
4eb13800cd
-WriteVein(), and some convenience functions for the vein bitmaps.
2011-07-18 15:55:41 -04:00
00cf7bc39e
Merge branch 'dfapi' of github.com:peterix/dfhack into dfapi
2011-07-18 16:28:06 +02:00
84f74bc091
Added plugin loading/unloading/reloading. Many locks. Too many damn locks.
2011-07-18 16:22:49 +02:00
e021199178
Merge pull request #106 from matthew-cline/TOPIC-folder
...
Get game's current world save folder
2011-07-17 02:26:06 -07:00
fdb5397a1d
Safer console shutdown.
2011-07-17 11:06:45 +02:00
a923d19f76
Get game's current world save folder
...
Use World::ReadWorldFolder() to get "region1" (or whatever it currently
is). Only have offset for Linux.
2011-07-16 16:00:50 -07:00
9f822af45a
Process: added a method for getting the main module base (windows). Returns 0 on linux.
2011-07-16 23:00:28 +02:00
d6d108dd34
Qt plugin fixes for windows, renamed interface to df_interface in Gui.
2011-07-16 18:10:08 +02:00
9025066a2b
Added SDLreal.dll on windows.
2011-07-16 10:32:18 +02:00
0d1dd5aead
Extended escape sequences are 4 bytes, not 5.
2011-07-16 10:31:49 +02:00
003ad63c56
Disabled ctrl+c on windows (null signal handler). Some small fixes.
2011-07-16 08:00:13 +02:00
fd418cd2dc
cmake cleanup in library/
2011-07-16 07:59:36 +02:00
9eea07fb66
The console is now awesome when you use C++ streams too.
2011-07-16 00:15:20 +02:00
b85f196dc4
The console is now awesome on Windows too.
2011-07-15 19:58:17 +02:00
459d48d75a
Made the linux console super awesome. The dfhack script won't LD_PRELOAD dfhack for gdb.
2011-07-15 15:55:01 +02:00
0af631aaa3
And nuke the rest of linenoise...
2011-07-14 12:28:41 +02:00
3ecf244e67
Nuke linenoise. Now it's integrated in Console.
2011-07-14 12:21:07 +02:00
d21b196766
Error printing call for Console, the NYAN CAT!
2011-07-14 11:15:23 +02:00
f2b46274ec
Fix for a bug in command history queue access. dfhack script can run valgrind.
2011-07-14 08:02:29 +02:00
de24b01a69
-fix pillar tile types to be TILE_SMOOTH instead of TILE_NORMAL.
...
-Added working (though clumsy) draw tile tool.
-Began lumberjack and veinswap tools.
2011-07-13 23:44:37 -04:00
96153a7b05
Merge branch 'dfapi' of github.com:peterix/dfhack into dfapi
2011-07-14 04:06:12 +02:00
792d272fbf
Windows side of the Console rewrite
2011-07-14 04:05:27 +02:00
a40153a8e1
Merge pull request #98 from matthew-cline/TOPIC-vermin
...
Vermin module and colonies plugin
2011-07-13 04:24:38 -07:00
630b746cfe
Integrate linenoise into Console - Linux part
2011-07-13 11:45:30 +02:00
d1170d54c3
Vermin module and colonies plugin
...
This is the start of the vermin module. Right now it just gets a list
of the positions at which vermin are created (spawn points). Most
spawn points are invisible and transient, but colonies (ant hills and
such) are permanent and visible. The address of the spawn points vector
is only provided for Linux 0.31.25
The colonies plugin uses the vermin module to list the location and
species of colonies, and can either wipe them all out or turn them all
into honey bee colonies.
2011-07-12 23:17:51 -07:00
a30a4a2720
CMake linux: copy LD_PRELOAD script
...
Copy package/linux/dfhack to the games directory; it's the same as the
normal df script, but sets LD_PRELOAD properly.
Also, CMAkeLists.txt now checks to see that the output directory is set
to the game directory, and fatally fails if it isn't.
2011-07-12 17:25:27 -07:00
b5a6087da5
Forgot to commit a file.
2011-07-12 23:27:09 +02:00
3a67a4d3c7
Added linenoise library to allow line editing in the terminal.
2011-07-12 12:13:14 +02:00
aeeece5c5f
Made kittens plugin optional, and disabled by default.
2011-07-12 00:07:59 +02:00
fa4d2d9b2e
Removed some silly data races from using cerr...
2011-07-11 23:07:42 +02:00
4015586d89
Eliminated the core suspend latency, possibly added a heap of race conditions. Added vdig.
2011-07-11 22:23:13 +02:00
5c1526d6d9
creatures: read and write pregnancy counter
...
Also change creaturemanger to print out the ticks-until-birth for
pregnant creatures.
2011-07-11 02:48:10 -07:00
5da4eb3344
readSTLString() new/free mismatch fix
...
valgrind caught a problem where memory was allocated with "new[]" but
freed with "delete"; changed it to free with "delete[]".
2011-07-11 02:06:38 -07:00
3850954449
Hotkey input works on windows/under wine. Added skeleton for the veindigger plugin.
2011-07-10 21:07:14 +02:00
cb9c9aae7c
Deal with third flag group in creatures
...
Added support for reading and writing the third creature flag group,
t_creaturflags3 (the offest already exists in Memory.xml). So far I've
only figured out three of the flags (out of an apparent 13):
1) announce_titan, which causes the creature to be announced as if
it was a titan or FB which had just arrived.
2) scuttle, which causes the creature to be die like it had been
killed in the game. That is, it leaves behind a corpse, and
will generate unhappy thoughts in dwarves if approriate.
3) ghostly, for creatures which are the ghosts of dead dwarves.
I updated creaturemanager to use scuttle for --kill, and added the
action --erase to kill in the old way which doesn't leave a corpse or
creatre unhappy thoughts.
2011-07-10 04:00:52 -07:00
07c11c704d
Fix Windows build (untested, expect explosions).
2011-07-09 16:05:40 +02:00
d894ef0ffa
Hotkey UI for linux.
2011-07-09 11:33:58 +02:00
65d7278f53
Added a bunch of butchered SDL headers, catching SDL events on linux.
2011-07-08 03:55:37 +02:00
367d79bcfa
Weather plugin to mirror the weather tool.
2011-07-07 10:57:57 +02:00
8b298f8d91
More maps tweaks, function for block event removal, added cleanmap version that nukes spatter objects instead of rewriting their
...
bitmaps.
2011-07-07 09:49:58 +02:00
4ff5db06be
Maps no longer copy the map block pointer array, blocks are structs, map data is public.
2011-07-07 07:00:36 +02:00
74ab0f94aa
Added std namespace use for stl types in MapExtras.h
2011-07-06 12:26:18 +02:00
56a409d9a4
sync, some map data structures, commented out some dead code
2011-07-06 11:13:36 +02:00
b1d4163095
Fixed prospector, added the command list back, removed the plugin init console spam.
2011-06-27 04:49:56 +02:00
00ddb45dbd
Added optional plugin_onupdate function, called each Core update.
2011-06-27 02:13:01 +02:00
722531f590
Added destructor code for PluginManager, console color reset funstion.
2011-06-25 08:05:17 +02:00
6fd7d42f00
Plugin manager, reworked kittens and reveal.
2011-06-25 05:35:29 +02:00
0bb097296a
Prospector prints text again. Plugin lookup is better (ignores more non-library files)
2011-06-24 02:48:56 +02:00
857decbcce
Plugins go into a folder, disabled console close button on windows because of bugs.
2011-06-22 18:04:22 +02:00
8f27966540
Console revamp - windows part
2011-06-22 14:25:39 +02:00
f8cdd95b09
Console revamp - linux part.
2011-06-22 08:14:21 +02:00
c6dc4900d2
Very basic plugin system.
2011-06-20 04:29:38 +02:00
ffd2ca3281
License updates done, removed argstream.
2011-06-20 01:17:49 +02:00
f2b91d3269
Making ready for adding plugins. Fixes all over the place, more removal of obsolete parts.
2011-06-20 01:12:07 +02:00
e0fb8f7c81
Crud removal: Context is gone. Added missing FakeSDL.h
2011-06-17 15:02:43 +02:00
4da11927af
Kittens, now for real. Also a lightweight curses relacement. Use it, love it.
2011-06-17 02:09:03 +02:00
93be1eb1fb
Yay, kittens! Also some license cleanup, IO thread usage, more SDL wrapping and ability to run reveal from DFHack console.
2011-06-16 23:53:39 +02:00
7136ac7aa4
Get rid of the stdint.h garbage and use the real header.
2011-06-15 17:35:47 +02:00
b29871cb8c
Fixed tick count offset, hotkey support is back from the dead (untested)
2011-06-15 06:09:24 +02:00
71d46d533f
Some windows console refinement.
2011-06-14 16:49:53 +02:00
22b79bb46e
Now works on Windows again, some more cleanups, added a singleton Core object for holding all the globals.
2011-06-14 16:13:28 +02:00
0a428b509e
Vegetation module becomes rather skeletal.
2011-06-13 21:11:02 +02:00
511f459182
Stripped nonsense from the DFHack vector wrapper. Next step: removal.
2011-06-13 01:14:10 +02:00
81d648dfa7
First 'working' DFHack inside DF, for 'some' values of 'working'.
2011-06-12 23:17:40 +02:00
da2fb1cb1a
Fix creature owned items vector offset on Windows, added support for owned items to more versions.
2011-05-28 10:18:50 +02:00
6e00dc4c8e
Update version numbers, readme file. Adding a lot of batch scripts for the windows versions of new tools.
2011-05-27 08:20:52 +02:00
07bb0408c1
Fix memory.xml and pdcurses.dll copy problems for good.
2011-05-26 12:33:38 +02:00
a459ee8137
Added 'glowing barrier' to the known tile types.
2011-05-26 05:51:04 +02:00
0661248d1f
Cleanmap filters on matter state. Anything non-solid is removed (including mud and water). Solid mud and snow stay.
2011-05-26 02:14:42 +02:00
6d32802dd4
Vegetation update order is a 16bit integer!
2011-05-26 02:13:29 +02:00
608b0f9f56
Better document Items module
2011-05-26 02:10:23 +02:00
e7d9bc6f91
matter states for tile coverings, pig iron watch in dfstatus
2011-05-25 05:13:24 +02:00
d2e01ec579
Fix many warnings from MSVC builds.
2011-05-23 21:30:51 +02:00
040b5be290
Reformat stopwatch.h for readability
2011-05-23 04:19:17 +02:00
c6b749e7e5
Small tweak to process enumeration on Windows.
2011-05-23 03:24:16 +02:00
e5e0391d76
stop dfstatus from wasting time. added 'stopwatch.h' to extras for getting accurate unix time in milliseconds
2011-05-21 21:54:53 +02:00
bb99924b24
Curses support across platforms!
2011-05-21 20:32:53 +02:00
909cd8b60b
Move termutil to a globally accessible area.
2011-05-17 08:36:38 +02:00
61dea59e29
Fix a big heap of warnings.
2011-05-15 22:24:40 +02:00
515f4952a9
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
library/include/dfhack/DFProcess.h
2011-05-15 21:50:20 +02:00
fe6eb4b70a
Fix for MSVC build, added prototype cmd.exe detection on windows.
2011-05-15 05:19:51 +02:00
4d3f4c2c23
Unknown 3 was update order.
2011-05-15 02:21:24 +02:00
d9e9fae7a0
Unknown 1 was the grow counter. Added the immolate and grow tools.
2011-05-15 01:53:43 +02:00
43fc15476a
Added ability to set trees on fire.
2011-05-15 00:26:44 +02:00
b65c4ed55b
New vegetation variables, fixed vegetation vector for 31.25 linux
2011-05-14 15:51:11 +02:00
7dbb41cc66
Add method for writing block/map feature indexes
2011-05-13 05:00:29 +02:00
a7be2aee33
Support actually removing owner links between items and creatures.
2011-05-12 21:10:29 +04:00
c7f4f8c281
Support printing refs in dfitemdump, and add methods for containers.
2011-05-12 21:10:29 +04:00
77dda6faea
Support overwriting and removing values in STL vectors.
2011-05-12 21:10:20 +04:00
4631ec2e0d
Item quantity support for 31.25
2011-05-11 23:53:16 +02:00
ed1477b53d
Support listing items owned by a creature.
2011-05-09 14:49:44 +04:00
14f291d539
Support reading the item ID field, which is used for cross-referencing.
2011-05-09 14:04:39 +04:00
e993bbcb67
Implement class name caching and optimized equality check.
2011-05-09 13:48:54 +04:00
3935293986
Attach and suspend all threads on linux.
2011-05-09 13:17:35 +04:00
abc473db5d
Implemented thread enumeration on linux.
2011-05-09 01:55:02 +02:00
6dc80d393f
Remove silly debug output
2011-05-08 03:36:26 +02:00
96bfec5402
The mood offset on linux was OK. General fixage of things.
2011-05-08 03:21:34 +02:00
8c4916958e
A fixme in Maps: replace feature reading with accessors
2011-05-07 20:23:31 +02:00
8b2ab8de68
Ending the map feature failtrain.
2011-05-07 09:07:28 +02:00
97af676bdb
Fix color variable naming in t_descriptor_color
2011-05-07 03:48:41 +02:00
fc0f6f1e48
Minor rearrangement with no impact
2011-05-07 03:44:10 +02:00
7ad83c80b8
added modified getopt (c++-ized) with BSD license, vegetation flags clarified, prospector lists trees and plants separately,
...
prospector pretty-prints
2011-05-02 05:03:48 +02:00
3318487ad9
Untested item deletion mode for the autodump tool.
2011-04-30 04:48:28 +02:00
456a979244
Fun with tiletypes. Expect explosions.
2011-04-28 23:00:52 +02:00
03a3f29871
Fix misplaced exports
2011-04-28 05:10:37 +02:00
6e38ce71df
Item flag garbage_collect.
2011-04-28 01:41:59 +02:00
923c8cae9c
Occupancy support in MapCache. Added the item dumper tool mentioned on irc (autodump).
2011-04-28 01:36:31 +02:00
21ddc2c461
Fix build on Windows.
2011-04-24 03:00:23 +02:00
f481ee7b5d
Add missing stddef.h include in Creatures module.
2011-04-24 02:49:49 +02:00
b2a47cf99c
Fix STLstring writing for plain linux process.
2011-04-20 21:32:49 +02:00
66bb9d448c
Big messy commit...
2011-04-20 01:28:47 +02:00
bc855b296f
Merge branch 'master' of https://github.com/angavrilov/dfhack
2011-04-17 16:08:13 +02:00
cf3534bc42
Fix silly typo.
2011-04-17 13:13:23 +02:00
67ea981dc3
Big ugly deuglyfication of DFTileTypes and its use in the tools.
2011-04-17 13:06:19 +02:00
e255a2cba6
Rename single character member variables from DFTileTypes to something sensible.
2011-04-17 11:37:36 +02:00
6e607d45d9
Fixed mingw32 build.
2011-04-17 01:48:58 +02:00
b0cb59a3f2
The item designator tool lives again.
2011-04-16 23:57:04 +02:00
89169053ff
Item support for windows 31.25
2011-04-16 21:02:20 +02:00
56b29cf12e
Merge remote-tracking branch 'origin/master'
2011-04-15 10:58:09 +04:00
34128c2f6d
Item Accessor method pointer was used incorrectly.
2011-04-14 15:16:12 +02:00
1a8c27ce01
Fix accessor mess I made. Added Accessor description dump to the dfitemdump tool and Items module.
2011-04-14 01:42:03 +02:00
ebc4d21e66
Improve name structure handling, and support duplicating them (on linux).
...
The name structure actually contains additional linguistical data,
ignoring which produces wrong renderings for non-dwarfish names.
This data also obviously has to be copied with the structure.
Copying STL strings works by replicating the shared copy logic
(i.e. incrementing the reference counter), but leaks memory owned
by the string being overwritten.
2011-04-13 20:36:10 +04:00
f5911a14a6
Some const correctness, re-enabled job printing in the creature dump tool.
2011-04-12 13:59:07 +02:00
212500ee00
Big Items refactor, made all the Accessor offsets optional.
2011-04-11 22:13:06 +02:00
77f0885d9e
Merge https://github.com/angavrilov/dfhack into items
2011-04-11 12:48:28 +02:00
2e0ec2db72
Support retrieving the item owner reference.
...
Reference is done by item id, and stored in some kind
of generic reference vector in the item structure.
2011-04-11 14:32:53 +04:00
fbf76440b5
Try to handle signed and unsigned 16-bit accessors.
...
Not sure whether it makes much sense, seeing as some
accessors (e.g. wear) actually return 32-bit values,
assuming that the caller would correctly sign-extend
the lower half and discard the upper.
2011-04-10 22:44:01 +04:00
f6ae41fe49
Provide access to item header, including flags, and wear information.
...
Add preliminary offsets for the item data to Memory.xml
2011-04-10 22:42:25 +04:00
e3897b0f93
Improve the accessor instruction parser.
...
Instead of hard-coding complete machine code patterns, try
to really parse a certain subset of MOV instructions.
2011-04-10 21:51:21 +04:00
b0b76f6d7c
Tool for resetting hidden tile status after botched reveals.
2011-04-10 18:41:49 +02:00
b630e93c5a
Added base layer material support to map cache, material display to dfprobe.
2011-04-10 17:01:58 +02:00
7876a42258
The C test tool doesn't compile as a plain C program!
2011-04-10 15:36:01 +02:00
cfc1dad4b6
Fix the item flag bitfield & set the item vector ptr.
2011-04-10 16:55:22 +04:00
1d35044db3
Started removing C++-isms from C wrapper. Removed DFGlobal.h
2011-04-10 13:12:28 +02:00
c1deee768e
Add missing files, wix build on windows.
2011-04-10 11:03:24 +02:00
d4e2850768
Make C-wrapper compile times less ridiculous.
2011-04-10 10:50:32 +02:00
bb04aa1a32
Linux header cleanups. Windows side will follow.
2011-04-10 10:19:15 +02:00
425971ef8c
Linux fixes/creature vector addresses. Needs more testing.
2011-04-10 09:21:32 +02:00
696ca5ccb9
Merge branch 'master' of https://github.com/angavrilov/dfhack
2011-04-10 06:17:55 +02:00
4547c8c0aa
Use MapExtras more.
2011-04-10 06:17:11 +02:00
b5d086ac02
Fix memory access on 32-bit linux.
...
The reason for random read failures is that these defines
are only effective if they are placed before any system
headers, especially sys/types.h; in the old version they
didn't work, and pread was expecting a signed 32-bit offset.
2011-04-09 22:54:45 +04:00
5465890b34
Added more direction flags to engravings.
2011-04-04 11:57:09 +02:00
c0cdf8d827
Linux 31.22 support.
2011-04-04 03:49:29 +02:00
7b1f3ce72b
Job ID is a Word, not DWord.
2011-04-03 21:43:16 +02:00
8b8c70b5ff
Big creature jobs read/write fix (it was cmpletely broken)
2011-04-03 21:27:47 +02:00
fcc23149db
Engravings: 3 byte padding after the display character.
2011-04-03 03:25:12 +02:00
46c5041bea
Direction flags for engravings.
2011-04-03 03:19:34 +02:00
a68702000d
hexdump accepts length in bytes, hopefully fixed engravings struct
2011-04-03 02:49:03 +02:00
e18ade4ea6
Engravings are 0x28 bytes long.
2011-04-03 02:00:56 +02:00
4cfc12b52b
Engravings module.
2011-04-03 00:15:47 +02:00
68b13d6bf0
Dreary offset work.
2011-04-02 12:35:23 +02:00
84494e873c
added readClassName
2011-04-01 14:42:03 -05:00
3ef6893bc7
removed getPosition prototype (since the Position module doesn't exist anymore)
2011-04-01 14:41:26 -05:00
cb88d59358
uncommented C process wrappers
2011-03-31 13:56:12 -05:00
695303d0c6
added memrange buffer callback
2011-03-31 13:54:36 -05:00
5e67ee2970
removed unneeded memrange wrapper struct
...
renamed some stuff to match the C++ version
added read, write, readSTLVector, readString, getPath, getMemranges, and getPID
2011-03-31 13:47:17 -05:00
fea7d56c32
added DFProcess_C stuff to project lists (although they're commented out, since it's not done yet)
2011-03-31 09:46:34 -05:00
9b6f5d2ac1
first commit
2011-03-31 09:45:53 -05:00
837ea52c22
Fix windows/wine version information bugs related to processes without a PE header.
2011-03-31 05:39:12 +02:00
6cd08c3f31
Suspend all DF threads on Windows.
2011-03-31 01:14:08 +02:00
d6bd4d47fb
Revert "Hide depend headers better, upgraded tinyxml"
...
This reverts commit 54a580ac68
2011-03-31 01:12:50 +02:00
e61a907da1
Merge https://github.com/doomchild/dfhack
2011-03-30 14:35:41 +02:00
37b0dbe02e
31.25, tweaks to make dfliquids and dfreveal better
2011-03-30 14:27:47 +02:00
1bf6a2ea71
generally, function signatures are supposed to match between header and implementation file...
2011-03-29 10:42:04 -05:00
4c55f54464
spelled a couple of allocator names wrong
2011-03-29 10:41:45 -05:00
cf59b7802d
added getPosition
2011-03-29 10:23:04 -05:00
e34831a354
added getters/setters for cursor/view coords, window size, and screen tiles added ReadHotkeys
2011-03-29 09:59:12 -05:00
b3455b0192
MSVC is a pile of fail that can't even align variables in a struct.
2011-03-28 11:22:21 +02:00
75b44ba33b
Fix possible bug in zero length C string reading
2011-03-28 02:13:32 +02:00
cfd309bf70
fix C string idiocy.
2011-03-28 02:09:13 +02:00
8ef1ef1985
31.23 Windows support, tiny little tweaks to liquids tool.
2011-03-27 00:02:23 +01:00
635e1998ee
Stop DFVector from accessing VersionInfo in the constructor (slight optimization).
2011-03-25 06:40:33 +01:00
1a1a28ee3d
World module offsets for windows 31.22
2011-03-25 03:27:07 +01:00
4c030e7cc1
Some linux 31.22 offsets, slight tweaks to Materials
2011-03-25 02:31:27 +01:00
754647fe96
The mysterious variable is mysterious, 31.22 support, needs testing
2011-03-24 23:21:50 +01:00
ecb239f64c
Merge branch 'worldmap'
2011-03-24 17:43:28 +01:00
1f4ac33200
Clarification of some values of geology and local feature reading
2011-03-24 17:41:34 +01:00
7c971cd8f1
World coords for dfposition
2011-03-24 06:13:21 +01:00
d0a171a350
Add a form of ReadFeature applicable to already read blocks.
2011-03-24 04:39:38 +01:00
4090a378c1
Remove message spam, make sure the old methods act the same.
2011-03-24 04:20:34 +01:00
64a578b204
Added cache for map features inside the Maps module along with convenience feature getter for blocks. Adamantine vein refiller tool.
2011-03-24 04:00:23 +01:00
34a687b95a
Make sure things build with playground turned on.
2011-03-21 21:29:54 +01:00
e8ee9b7cab
dflair tool to match what the dfusion people have. minor tweaks to playground
2011-03-21 21:14:07 +01:00
7f0ba3b1ff
Fix header install rule.
2011-03-20 17:24:34 +01:00
0a35afb16a
Use proper paths in build system.
2011-03-20 17:17:33 +01:00
fe92edfb4e
No more generated config files.
2011-03-20 06:20:23 +01:00
c06df18ea7
Fix linux builds not installing the header files
2011-03-20 02:06:50 +01:00
1481b07b6b
Ubuntu packaging magic, forgotten header files, an icon.
2011-03-19 23:26:32 +01:00
2bc7aacb79
Remove precompiled garbage, fix dfcleanmap for real
2011-03-19 20:17:04 +01:00
a7f3258018
Get rid of SHM in modules.
2011-03-18 17:58:48 +01:00
7809ed6cd5
Small fixes to documentation and build scripts.
2011-03-18 16:47:55 +01:00
d75c940958
Kill Position module everywhere.
2011-03-18 11:45:37 +01:00
e1b80e6f33
Massive tool and wrapper fixage.
2011-03-18 11:38:37 +01:00
a6c724bfb5
Module rearrangement and doxygen documentification. API break.
2011-03-18 11:09:26 +01:00
b94ddf50d0
Eliminated silly dependency cascade within the library. Some documentation tweaks.
2011-03-18 08:53:59 +01:00
737643a33f
Spring cleaning in python wrappers.
2011-03-18 06:17:43 +01:00
001b8e059d
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-18 06:12:16 +01:00
2911b203ce
DFHack. Now with more packaging fun.
2011-03-18 00:07:40 +01:00
557d6733e2
Make the build system sane, pt. 1 - no install or packages yet
2011-03-16 07:35:08 +01:00
901cebc683
updated to use centralized pointer_dict retrieval
...
fixed an argtypes bug in read_vegetation
2011-03-15 15:36:48 -05:00
35438b82e3
added Hotkey structure
2011-03-15 15:35:50 -05:00
290368321c
updated to use the centralized pointer_cache retrieval
2011-03-15 15:35:29 -05:00
2c28d8f3bf
added read_hotkeys
2011-03-15 15:35:00 -05:00
6b467a36b5
centralized getting an array/list from the pointer_cache
2011-03-15 15:34:39 -05:00
d28279894f
first commit
2011-03-15 15:33:39 -05:00
2ea6a3d84a
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-14 22:06:25 +01:00
fda4ad94cd
added read_local_features
2011-03-14 15:01:09 -05:00
e126f21e4b
updated map coordinate struct/union
...
added callback for turning a std::map of coordinates to features into a list
2011-03-14 15:00:51 -05:00
5cbc9e5918
added Maps_ReadLocalFeatures
2011-03-14 14:59:31 -05:00
b1ed423f98
added map coordinate struct and the callback needed to flatten the std::map of coords to features into an array
2011-03-14 14:59:03 -05:00
d347713860
Merge remote branch 'upstream/master'
2011-03-14 09:54:19 -05:00
6ed74065d1
Cleanmap bugfix.
2011-03-14 09:18:09 +01:00
cb86f52993
minor liquids bugfix, added typedef for planecoord so that stonesense builds. Build system bits. Doxygen bits.
2011-03-13 19:38:32 +01:00
b6d02768b4
No DbgHelp.h
2011-03-12 11:01:53 +01:00
f0f3960bb0
added read_vegetation
2011-03-11 16:59:36 -06:00
de8226e142
fixed a couple of allocator callback names
...
added __str__ method to Tree
2011-03-11 16:59:25 -06:00
c5e9f67389
added ReadVegetation implementation
2011-03-11 16:58:42 -06:00
870be3a1e7
added tree buffer allocators
...
renamed a couple of allocators for consistency
2011-03-11 16:58:22 -06:00
6e54715706
added ReadVegetation
2011-03-11 16:56:21 -06:00
df3c6d706f
fixed a couple of small pointer bugs
2011-03-11 16:11:34 -06:00
4e3a66fcd8
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-11 22:38:25 +01:00
5aeac3d43d
updated CreatureCaste, and CreatureType structs
...
added MatglossPlant and creature type descriptor structs
got the creature type allocator callback working
2011-03-11 14:13:52 -06:00
f6a7de9ba6
updated getters to use the changed pointer caching stuff
2011-03-11 14:12:07 -06:00
5b29bf5280
changed pointer cache to use array addresses instead of pointer ids
2011-03-11 14:11:36 -06:00
b9e8aa8952
Materials_getRaceEx finally works as expected
2011-03-11 14:10:51 -06:00
49b7f8acb5
fixed a couple of bad return values
2011-03-11 14:10:22 -06:00
b75f513238
updated creature caste and type structs
...
removed some (now) unneeded callbacks
made a better t_creaturetype -> c_creaturetype converter
2011-03-11 14:09:51 -06:00
c223bb858f
Added MapExtras, ported dfliquids to MapCache. Fixed vein non-ident bug in dfvdig.
2011-03-11 03:09:45 +01:00
1de2efb162
updated documentation
2011-03-09 14:25:32 -06:00
828df5fa80
consolidated buffer stuff, so that the callbacks are a lot shorter
2011-03-09 14:20:34 -06:00
1839c6b843
fixed callback registration
...
allocator callbacks now cache the buffers and associated pointers so they don't get collected too early
added CreatureCaste, TileColor, and CreatureType classes
2011-03-09 12:29:29 -06:00
50af9e2d7e
updated to use the pointer caching callbacks
2011-03-09 12:27:58 -06:00
5bd51c2e08
updated to use the allocator callbacks correctly
2011-03-09 12:26:04 -06:00
44cbc3fd5c
fixed allocator callbacks to take pointers to pointers so they'll actually, you know, WORK
2011-03-09 12:23:20 -06:00
187a8a0578
added a function to read all the veins at once
...
updated vein reading functions to use the allocator callbacks correctly
2011-03-09 12:22:00 -06:00
5c32991c40
Corrected game mode enum and added a mode changing tool to the playground.
2011-03-07 00:19:12 -05:00
bbbea3d023
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-06 23:57:22 +01:00
9e62ee6e75
Maps + Materials for 31.20. Still many broken offsets!
2011-03-06 20:27:40 +01:00
9b0c426f9c
The age of creatures is signed int.
2011-03-06 11:42:02 +01:00
450562437a
Memory.xml cleanup, removing redundant information.
2011-03-03 23:54:44 +01:00
c98bc9da9d
updated to actually match the C stuff (not passing allocator callbacks every time, etc)
2011-03-03 14:19:20 -06:00
d314c733b2
added world and window_io getters
2011-03-03 14:18:28 -06:00
a816b67362
added key types for window_io module
2011-03-03 14:17:56 -06:00
6fc1f31e31
first commit
2011-03-03 14:17:31 -06:00
2c9016d2f2
added checks for allocator callback being null
2011-03-03 14:17:09 -06:00
4cf037d5d3
changed a couple of argument types to be more explicit
2011-03-03 14:15:38 -06:00
368f3c1b2e
added World getter renamed get_Window to get_WindowIO
2011-03-03 14:14:59 -06:00
f307d2c4c3
Merge https://github.com/doomchild/dfhack
2011-03-03 17:51:27 +01:00
6f7a8e3af5
Export fail removal - sa_feature, other minor changes
2011-03-03 17:50:17 +01:00
f4be3ef4fe
updated to use t_gamemodes struct in Read/WriteGameMode calls
2011-03-03 10:18:27 -06:00
680fe2981e
Merge branch 'master' of https://github.com/tomprince/dfhack
2011-03-03 16:56:38 +01:00
552180d430
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-03 16:24:26 +01:00
faea954da1
Now with less endless loops.
2011-03-02 22:43:46 +01:00
777e997da2
Make vein reading a little saner.
2011-03-02 22:36:02 +01:00
3ff4e2c43e
Get rid of 'unknown vein' spam.
2011-03-02 22:32:08 +01:00
a969f9893f
Fix wine process suspend/resume. They use same mechanism as attach/detach now.
2011-03-02 22:23:24 +01:00
509971d6b1
Small fix of the GameMode enum
2011-03-02 09:07:37 +01:00
f28a29d29d
Fix some warnings on linux using C99 scanf modifiers.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:36:26 -05:00
a82e249205
Move definition of sa_feature to .cpp to avoid unsed variable warning.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:29:27 -05:00
f477fc002c
Fix lots of -Wall warnings.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:19:18 -05:00
267bc1d446
Game/Control mode improvements. Use dfposition to check them.
2011-03-01 22:18:26 +01:00
f56cad1265
added grass vein and world construction readers
2011-03-01 14:39:56 -06:00
42670c798b
added grass vein and world construction types
2011-03-01 14:39:33 -06:00
06ae98c9dd
first commit
2011-03-01 14:39:18 -06:00
0b77744905
added game mode reader
2011-03-01 14:38:55 -06:00
bdb0ebd8ea
added grass vein and world construction readers
2011-03-01 14:38:18 -06:00
fa220531b7
Proper enum for game mode
2011-03-01 13:08:20 +01:00
54a580ac68
Hide depend headers better, upgraded tinyxml
2011-03-01 07:50:56 +01:00
b1061d0f94
Game mode reading, removed some include paths
2011-03-01 06:59:23 +01:00
c6a402c2b8
One more vein type. No ready for use.
2011-02-27 20:43:44 +01:00
254aec1787
Alternate way to read vegetation using a vector in map blocks. 31.19 only for now.
2011-02-27 13:59:45 +01:00
4284b948a0
Creature matgloss, creature and color matgloss offsets.
2011-02-27 09:48:08 +01:00
d6592502cc
No need to start Buildings for reading the custom types
2011-02-25 03:13:50 +01:00
803269122f
... What The Hell ?
2011-02-24 21:34:51 +01:00
820acc7483
Windows fixes
2011-02-24 21:32:12 +01:00
97bfa32a82
More cleanup in the Process lands.
2011-02-24 11:43:33 +01:00
79b78673e5
Fix build on MSVC
2011-02-24 01:32:15 +01:00
d26f9ee4a4
Merge branch 'master' of https://github.com/tomprince/dfhack into tomprince-master
2011-02-23 23:48:24 +01:00
62bec260b1
Fix 32bit linux build again.
2011-02-23 21:57:36 +01:00
a62196dea3
Merge branch 'master' of https://github.com/tomprince/dfhack into tomprince-master
...
Conflicts:
library/DFProcess-linux.cpp
2011-02-23 21:55:24 +01:00
4806318494
Factor out microsoft string handling functions.
2011-02-23 15:55:07 -05:00
aac3056b12
Get rid of NormalProcess::Private on windows.
2011-02-23 15:27:15 -05:00
a5479a4bef
Linux 32bit fix.
2011-02-23 20:13:29 +01:00
63ab8672d3
Add create*Process functions to create process instances.
...
This allows us to remove friendship of DFProcessEnumerator for Process
subclasses.
2011-02-23 06:13:10 -05:00
2927b08f93
Remove handle-body idiom of DFProcess on linux.
...
Since the classes aren't exposed to the client, there is no reason to
split the class.
2011-02-23 06:11:28 -05:00
b3c490857c
Refactor DFProcess-linux-{,wine}.cpp into DFProcess-linux-base.cpp.
2011-02-23 06:11:28 -05:00
c287e54793
Merge much of DFProcess-*-SHM.cpp into DFProcess-SHM.cpp.
2011-02-23 04:02:14 -05:00
9ba80d517f
Remove some gratuitous differences in the SHM implementations.
2011-02-23 02:26:55 -05:00
9b854be327
Remove duplicate code implementing readInt.
...
Implement one version in terms of the other.
2011-02-23 02:04:29 -05:00
9964dbac72
Add missing private/ProcessInternal.h
2011-02-23 01:07:22 -05:00
6ca0dd7c1d
Fix Process class.
2011-02-23 04:01:07 +01:00
9f5ee8a790
Many fixes, still many to go.
2011-02-18 02:51:17 +01:00
1c8249c55a
Mingw32 fixes
2011-02-18 01:14:16 +01:00
02e6e46d5f
Grass veins
2011-02-17 01:54:45 +01:00
72fd88cff3
Windows base map offsets
2011-02-17 01:18:27 +01:00
eb1a0b6b22
A little cleanup in Context.cpp, started work on 31.19
2011-02-16 19:29:16 +01:00
ad5e207276
make veinlook work with less offsets (maybe)
2011-02-15 00:45:37 +01:00
6c9652258d
memory xml bugfix related to valid attribute of the Offsets tag
2011-02-14 21:25:02 +01:00
3835ba0f75
Search tools run on windows and moved to supported, some windows segment/heap/PE section enumeration work.
...
New windows dependency: ntdll.lib
2011-02-14 03:58:32 +01:00
e958b8432a
More work on windos VM map method (compiles, needs testing), some MSVC 2010 nonsense warnings disabled.
2011-02-12 10:26:36 +01:00
d16bee48d2
Merge branch 'master' of github.com:peterix/dfhack
2011-02-08 22:57:14 +01:00
5bed6c5949
Sync, autosearch skeleton.
2011-02-08 22:55:40 +01:00
7676120dc8
Windows VM ranges (not tested)
2011-02-08 15:34:34 +01:00
130d965494
TODO use VirtualQuery
2011-02-08 14:34:43 +01:00
8439b3fa7d
Required fixes for properly exporting the new symbols.
2010-11-19 02:40:38 +01:00
c13b7c035f
Fix weather tool/offsets for 31.18. Added a file I missed.
2010-11-19 01:14:41 +01:00
ac91f46b6c
Merged patches from Rainer Keller
2010-11-17 20:50:50 +01:00
1a93c73737
Big chunk of windows 31.18 offsets.
2010-11-17 04:48:06 +01:00
a5d21e612b
Fixes, some messing around with the invalidation code
2010-11-08 00:31:40 +01:00
9ac7c1a9f2
memory.xml invalidation (untested)
2010-11-08 00:10:59 +01:00
457b331be7
Small fixes
2010-11-03 10:45:29 +01:00
cb6cf89b0c
Merge branch 'master' of http://github.com/reverb/dfhack
2010-11-01 10:47:15 +01:00
ab1a3a8cef
Salt/Stagnant water finally understood.
2010-10-29 07:36:06 +02:00
4edd33e13a
Fix crash when deallocating items module
2010-10-28 17:22:56 -05:00
5e507163b8
Material fix, custom reaction items seem to work again with offset update and bars work
2010-10-27 22:30:58 -05:00
df012b4bae
Fixes animal bars but may need to be reworked if other item types were messed up. Also, fix shouldn't break other types.
2010-10-25 16:15:14 -05:00
48dd2fc424
Merge remote branch 'upstream/master'
2010-10-25 16:12:27 -05:00
70cb93d9f4
Fixed includes, unified formatting.
2010-10-25 04:39:14 +02:00
92d0468694
added more information to probe.
...
added pit-with-floor option to hellhole.
bug fixes for the fake magma pipe in hellhole.
2010-10-20 12:31:16 -04:00
ba88c86670
dfitemdump appears to work. Materials still buggy (Pig Iron Bar != Mule Bar). This has been bugged since .12 or earlier
2010-10-19 05:07:07 -05:00
3acc410857
Tile Types update, and new hellhole n deramp tools in playground
2010-10-17 00:21:18 -04:00
b3121b898d
Urrgh. Seriously.
2010-10-07 01:23:35 +02:00
ec032240aa
Merge branch 'master' of http://github.com/belal/dfhack
2010-09-24 19:07:38 +02:00
b95ec7a2b3
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-09-24 19:07:07 +02:00
583f997e2f
fix linux getPaths to append a null terminator on the strings
2010-09-23 08:33:45 -04:00
a8ae899f2e
Add checks to handle missing custom workshop offsets.
2010-09-22 18:34:51 +02:00
a3870bb5a1
Constructions, buildings, base 31.13 windows entry on DF2010 instead of 31.12.
2010-09-22 18:20:55 +02:00
026a2eb94e
Merge branch 'master' of git://github.com/peterix/dfhack into belal
2010-09-22 10:42:22 -04:00
369b7cf701
Fix MSVC10 build error.
2010-09-21 03:18:34 +02:00
8ac0b653df
Merge remote branch 'upstream/master'
2010-09-20 12:40:44 -05:00
1a5bce53a7
added ReadGeology
2010-09-20 12:40:00 -05:00
0f7a27d611
fix the WindowIO-windows.cpp module to work correctly with the new DF, also made it a little simpler.
2010-09-19 19:50:20 -04:00
88934f0add
Materials done
2010-09-19 06:17:48 +02:00
dfdd1467ff
Offset stuff
2010-09-18 04:36:14 +02:00
918de0271b
fix to get the windowIO.h to compile from a submodule
2010-09-17 09:20:15 -04:00
3dfbc5fb21
update widows getPath to only output the path, not the path and exe filename, to correspond with the linux versions
2010-09-16 21:44:38 -04:00
6661d7e1f7
added getPath() for all linux versions as well, should work fine
2010-09-16 18:21:41 -07:00
9844a8f8b3
added SetPauseState wrapper
2010-09-16 13:10:13 -05:00
70b1a48cea
added unregistration functions for callbacks
2010-09-16 13:05:02 -05:00
78a12876d5
added ReadInventoryIdx and ReadInventoryPtr wrappers
2010-09-16 13:04:19 -05:00
36400f2833
Merge branch 'dotnet'
2010-09-16 09:06:12 -05:00
3592748a50
Bits and pieces
2010-09-16 15:09:42 +02:00
d2db7524a1
Keeping the current working directory addition, but reverting the current tileset and color stuff, as the tileset was just an initializer, not the actual current one, just going to have to read the init.txt file myself
...
Revert "Add function to get the current working directory of the DF process, as well as offsets for the relative paths of the current tileset and color file, also created a simple program to dump those three things out"
This reverts commit 040f8f7b7a
2010-09-13 09:45:53 -04:00
040f8f7b7a
Add function to get the current working directory of the DF process, as well as offsets for the relative paths of the current tileset and color file, also created a simple program to dump those three things out
2010-09-12 21:38:21 -04:00
f6b137230a
Fixed pause state offset in 31.12 linux version, dfreveal pauses and has improved usability.
2010-09-04 07:43:39 +02:00
315aab0d57
added registration functions for callbacks, since some languages can't directly access DLL data exports (*cough*P/Invoke*cough*)
2010-09-03 10:31:14 -05:00
5a5745590a
More Creatures rework, this time with more memset
2010-09-03 03:01:37 +02:00
dc6aa19083
Creature rework
2010-09-03 02:15:09 +02:00
a46422d2a6
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-09-01 20:30:25 +02:00
f1307d9f13
Added a common exception for DFHack, made World and Position use it for feature detection.
2010-09-01 18:03:52 +02:00
988b1d8692
Added support for reading and setting the weather.
...
Signed-off-by: Mike Stewart <thewonderiidot@gmail.com>
2010-09-01 11:22:19 -04:00
86aa19daa4
Fix for Creature module
2010-08-31 17:21:47 +02:00
66c3d30bd8
Fix Gui module so Stonesense can work.
2010-08-31 12:59:48 +02:00
ff550a7e09
Fix getPE()
2010-08-31 07:07:37 +02:00
b9bee108e1
Sync, fixes.
2010-08-31 06:52:03 +02:00
9bcdc78d00
name of GUI offset group was wrong in its module
2010-08-31 05:32:40 +02:00
95166d39a2
changed uint to uint32_t in declaration of VersionInfo::getPE()
2010-08-30 12:37:13 -05:00
c5c1d52047
fixed spelling of BUILD_DFHACK_C_BINDINGS
2010-08-30 12:36:40 -05:00
95abf6e605
All the modules *should* now use the new offset storage properly. Maybe, needs testing :)
2010-08-30 00:08:17 +02:00
2dd8aed7a0
Merge branch 'master' of git://genodeen.net/adeon_dfhack
...
Conflicts:
CMakeLists.txt
library/modules/Position.cpp
2010-08-28 22:47:38 +02:00
85240c78b5
Fix probe utility, Position module
2010-08-28 22:07:31 +02:00
d46dcb8342
Maps stuff, geology seems broken
2010-08-28 15:43:53 +02:00
51d545402d
Offset dumper reports missing offsets instead of skipping them
2010-08-28 14:06:18 +02:00
b44fd18dc8
Merge branch 'master' of http://github.com/belal/dfhack
2010-08-28 13:52:12 +02:00
2703d74fbd
Sane output from offset dumper
2010-08-28 12:47:33 +02:00
4d55e37e20
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-08-28 06:36:40 +02:00
84b417cf1a
Memory-ng.xml should be consistent now. Offset dumper doesn't complain.
2010-08-28 06:31:44 +02:00
e762f1caea
Merge branch 'master' of git://bigbox.banquise.net/dfhack
...
Conflicts:
tools/examples/creaturedump.cpp
tools/supported/dumpoffsets.cpp
2010-08-28 04:39:03 +02:00
f2dea86819
Seemingly working VersionInfo loading parts. The offset names are now all wrong in the modules. DO NOT USE
2010-08-28 03:57:56 +02:00
2df6433fef
Fix map reading for dfcopypaste, add simple console application to do the copy/pasting.
2010-08-27 14:56:38 -04:00
afdc91265d
Revert "Add a dirty hack to stop flickering on non-synchronizing DF processes."
...
This reverts commit 3a33e64acc4da7270eef30ef595fc6f82eb72efc.
I guess it's better this way.
2010-08-27 18:34:13 +03:00
4197ad064f
Add a dirty hack to stop flickering on non-synchronizing DF processes.
2010-08-27 18:34:12 +03:00
35a58cdf0c
Add screen_tiles_pointer for Memory.xml and fix reading screen tiles in Position module.
2010-08-27 18:34:12 +03:00
60bfc1d420
added the new callbacks to the list
2010-08-27 09:31:08 -05:00
c7f37b697c
added include for Position.h
2010-08-27 09:30:15 -05:00
33cd5fb1b4
added ReadHotkeys and getScreenTiles
2010-08-27 09:29:55 -05:00
fb7cfc45c8
added getType
2010-08-27 09:19:43 -05:00
cfa39dde7f
wrapped ReadGlobalFeatures
2010-08-26 10:29:04 -05:00
b78b0ad2e6
wrapped ReadMenuState
2010-08-26 10:28:31 -05:00
fba11842bc
add allocator callbacks for t_feature, t_hotkey, and t_screen
2010-08-26 10:27:56 -05:00
1327b7236b
changed extension to "rst"
2010-08-25 09:20:00 -05:00
b33d56354f
OffsetGroup class (unfinished)
2010-08-23 19:28:53 +02:00
143f30f64b
Merge branch 'master' of http://github.com/sizeak/dfhack
...
Conflicts:
library/VersionInfo.cpp
2010-08-23 16:16:58 +02:00
0ddc431013
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-08-23 16:11:46 +02:00
368de864a1
Sync
2010-08-23 01:29:55 +02:00
1bceac2343
Rename memory_info and its factory class.
2010-08-20 14:10:05 +02:00
a08258e36b
"import pydftypes" changed to "import dftypes"
...
buildings now using custom workshop callback
creatures now using material callback
fixed return value for civ and race index getters
2010-08-19 12:51:02 -05:00
a508542d7c
added material and custom workshop buffer callback
...
updated Creature class definition with new members
fixed field size in Skill class
2010-08-19 12:47:45 -05:00
464919635f
fixed bug where reading en empty job list played with a null pointer
2010-08-19 12:45:43 -05:00
fd872922a5
updated to match C++ additions
2010-08-18 16:00:58 -05:00
f2696dadca
added updated Write functions
2010-08-18 15:46:15 -05:00
2889b01357
updated to use pre-registered callbacks like everything else
2010-08-18 12:59:11 -05:00
9cf2e0f26d
Support for reading inventory
2010-08-17 15:21:54 +02:00
34b6bc06b6
started in on added docs
2010-08-16 14:52:00 -05:00
e84ea20fb0
minor cleanup
2010-08-16 14:19:26 -05:00
d96578a3b4
added missing #include for DFTileTypes.h
2010-08-16 13:50:34 -05:00
e57be44cde
Merge remote branch 'upstream/master'
2010-08-16 13:41:33 -05:00
3b29fddf7b
unify build system, start on the new offset file format
2010-08-16 00:45:02 +02:00
94872b8abd
A bit of checking in some places.
2010-08-14 18:32:38 +02:00
a159707250
Fix memleak with Context not cleaning up.
2010-08-14 01:25:18 +02:00
7fbdd6c69a
Cleartask tool, updated docs.
2010-08-13 23:25:14 +02:00
bae7b88be0
Make sure the compatible memory.xml is used.
2010-08-13 21:44:17 +02:00
78c5ef5c71
added vein readers
2010-08-13 12:31:53 -05:00
a94c398a0e
added vein allocators
2010-08-13 12:31:31 -05:00
2a34b9fd79
first commit
2010-08-13 12:30:58 -05:00
b26506195e
Merge remote branch 'upstream/master'
2010-08-13 09:40:45 -05:00
f6a777bccd
added getter for tile type
2010-08-13 09:40:32 -05:00
cf8c805add
just made the tile type array length a #define
2010-08-13 09:39:37 -05:00
8fa3d0811c
Make building C bindings optional.
2010-08-13 02:35:10 +02:00
21f7f8e703
Moved memory defs to /data. Memory.xml is copied into the right folder at build time (works even with MSVC).
2010-08-13 02:23:38 +02:00
f6aea927c8
Memory.xml in new format (offsetedit/Memory-ng.xml). The declarations/descriptions are still missing.
2010-08-12 21:38:15 +02:00
1e9c4a0450
Added function to get const reference to stored map of labours. Nothing special
2010-08-10 22:28:53 +01:00
7d684d12b4
Job writing for mood material editing
2010-08-09 19:28:35 +01:00
3afff27f03
A bit of offset work on linux, uprated README and COMPILE, screen reading code (untested).
2010-07-19 21:42:17 +02:00
0cb5e99a44
Fix for SHM on windows
2010-07-17 20:13:44 +02:00
52178e779f
Fixes to merged C API and windows SHM.
2010-07-17 01:55:18 +02:00
9bafefbd80
Merge branch 'master' of git://github.com/peterix/dfhack
2010-07-15 12:58:25 +01:00
1e7a705129
getType needs lots of work but its ok(ish). Mostly working .10 creature offsets
2010-07-15 12:57:45 +01:00
ebbb497630
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-07-15 00:47:51 +02:00
46d776cf46
doxygen index page, OnResume all modules from Context::Resume
2010-07-07 01:35:38 +02:00
a8b5c461fe
added terrain checkers
2010-07-06 14:07:39 -05:00
e7751f8fd9
changed vein readers to return a pointer to a buffer of just one kind of vein at a time
2010-07-06 13:45:35 -05:00
9ef7a74a44
added MapPoint class
2010-07-06 13:19:55 -05:00
3abdd0f2f2
added vein reading functions
2010-07-06 13:18:36 -05:00
c77a049d8b
Merge remote branch 'upstream/master'
2010-07-06 10:57:24 -05:00
ec35663b62
Common base for all modules
2010-06-25 07:11:26 +02:00
4f009a5c5c
Civilisation writing
2010-06-23 03:32:33 +01:00
e1e1850d8e
Position writing
2010-06-22 18:27:27 +01:00
3f0ab50b5d
mood skill writing
2010-06-22 17:21:09 +01:00
8d07001674
0.31.08 Windows SDL
2010-06-20 19:20:10 +02:00
31167475de
Tool for dumping the effective addresses/offsets of a running DF instance
2010-06-20 02:50:37 +02:00
95b52d099f
flag writing type fix
2010-06-19 20:09:16 +01:00
bbb29fe3d5
Find, Filter, FindInRange and Incremental search methods
2010-06-19 03:47:09 +02:00
0b9605e08a
changed def to class (durrrr)
2010-06-18 10:39:40 -05:00
0735c8b84a
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-18 01:18:00 +01:00
5fd94efb10
Added moods to memory.xml
2010-06-18 01:17:19 +01:00
41f3432d1c
whitespace
2010-06-18 01:17:46 +02:00
d3e7701bc8
Fix template brackets
2010-06-18 01:10:03 +02:00
760cb59522
Merge branch 'master' of http://github.com/sizeak/dfhack
2010-06-18 01:08:23 +02:00
ecb83f2288
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-06-18 01:08:07 +02:00
96c774629a
Added mood writing. Mood only, not skill or anything. Seems to work ok
2010-06-17 23:18:01 +01:00
5b71ac7dae
add __init__ file
...
renamed flags and types
2010-06-17 16:26:53 -05:00
fa8238af08
removed reveal and force_suspend to examples
2010-06-17 15:38:48 -05:00
d58260740f
moved the old Python/C stuff to python/deprecated
...
renamed "c api" to "pydfhack"
2010-06-17 15:32:53 -05:00
061108c685
weird skill reading byte alignment fix (reverted to how it was original minus the offsetof change)
2010-06-17 19:24:18 +01:00
39222c972a
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-17 14:16:37 +01:00
c53b643886
Fix liquids bug, added status checks to Maps (still not the real thing, but better)
2010-06-17 06:46:20 +02:00
9a15f00c8d
bug fix, sex writing (seems to work ok), trait writing(untested)
2010-06-16 20:47:05 +01:00
5e105c9571
fix typo
2010-06-16 02:03:37 +02:00
ba9d2d14c2
Magic number cleaning
2010-06-16 08:01:17 +08:00
77d2343742
Attribute writing added
2010-06-16 07:22:39 +08:00
8fb05f24db
Skill writing added
2010-06-16 07:22:38 +08:00
2254f3dfe5
Flag writing function added
2010-06-16 07:22:38 +08:00
b95efc22fe
Happiness writing function added and tested. Seems ok so far
2010-06-16 07:22:38 +08:00
b732e63673
long long
2010-06-11 20:13:37 +02:00
3f099f8928
LARGE_INTEGER replacement
2010-06-11 19:53:28 +02:00
0562ce9802
Ok fixed level data to work from 0 to xp needed for next level. Due to xp starting from 0 for each level, getting the level based on xp had to be removed so now you can only get level data by level, which returns a struct containing level, name and xp need to next level.
2010-06-11 00:00:21 +01:00
3142e75186
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-10 17:42:38 +01:00
8987111cfe
Stupid mistake was stupid
2010-06-10 17:31:09 +01:00
45031a3724
Added levels done (unless issues)
2010-06-10 16:53:25 +01:00
7885eb8e74
0.31.06-SDL, needs testing
2010-06-10 10:30:56 +02:00
1645df7088
Some offsets for 0.31.04, bugfixes
2010-06-06 00:56:09 +02:00
6b7f3e1816
Big namespace cleaning
2010-06-05 00:02:02 +02:00
115e969530
Build fixes, made precompiled SHM libs
2010-06-04 03:05:38 +02:00
b8600169ef
Minor comments and other changes
2010-06-01 21:06:16 +02:00
123fb5a9d0
Lots of comments. Using templates in the search tool.
2010-05-30 05:13:59 +02:00
5ee4acfd2e
Fixed build problem in C API. Beware of bad memory management!
2010-05-29 23:50:14 +02:00
fa0d881e16
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-05-29 23:39:59 +02:00
95b44a8ef3
Documented ContextManager
2010-05-29 22:46:23 +02:00
7300e61f8a
ContextManager and ProcessEnumerator have the basic functionality done.
...
Created a test program to validate them and show how to use them.
2010-05-29 21:34:36 +02:00
ab40868b29
ProcessEnumerator tracks processes properly now.
2010-05-28 05:18:32 +02:00
66159d4221
updated to use new callback signatures
2010-05-27 12:35:40 -05:00
3caac25145
changed callback signatures to allow for return codes
2010-05-27 12:35:11 -05:00
6e91b7c9de
updated to include WindowIO_C and World_C
2010-05-26 14:51:39 -05:00
a962299c20
cleaned up header includes
2010-05-26 14:51:21 -05:00
bd4456b5f6
Fix bad SHM reads of ranges above 1MB.
2010-05-26 18:05:12 +02:00
af1a41712e
Tiny fixes.
2010-05-26 17:54:30 +02:00
ee8ac4e508
Missed an include ~_~
2010-05-26 15:15:14 +02:00
04b71f154c
Fun and games. Also turning old DFWindow class into a module tracked by Context.
2010-05-26 12:24:45 +02:00
966a145b3e
Moving stuff around, part 3
2010-05-26 08:42:09 +02:00
b710ed687a
Moving stuff around, part 2
2010-05-26 06:48:23 +02:00
cd18db8ccd
Reorganize pydfhack
2010-04-02 16:49:07 +02:00
d3f1f63d92
Merge branch 'pydfhack' of git://github.com/doomchild/dfhack into DF2010
2010-04-02 16:47:46 +02:00
c26da9b84c
More DF 2010 reorganization
2010-04-02 16:46:33 +02:00
49ecc368bf
added getter for window size added ReadHotkeys
2010-04-01 17:01:46 -05:00
3324327535
added getter for current cursor creature
2010-04-01 17:01:41 -05:00
37cc11615c
added setters for view/cursor coordinates
2010-04-01 17:01:34 -05:00
07cb3b8ac2
Read*Matgloss calls now return a dictionary of tuples, keyed on the matgloss.id
2010-04-01 17:01:14 -05:00
8308b73b6c
disabled SWIG build step
2010-04-01 17:01:07 -05:00
3be3174c33
added Read*Matgloss calls
2010-04-01 02:55:11 -05:00
23460c94d8
added license message
2010-04-01 01:02:03 -05:00
e39330847b
added license message
2010-04-01 01:01:47 -05:00
fda4482dc5
added license message
...
added MatGlossPlant struct
2010-04-01 01:01:16 -05:00
5f09b47ca8
added license message
2010-04-01 01:00:51 -05:00
6af1f482ca
add matgloss.cpp
2010-03-31 19:02:08 -05:00
93058506e0
first commit Read/Write Designations works
...
Signed-off-by: doomchild <doomchild@theyfear.us>
2010-03-31 17:35:56 -05:00
35960db5aa
Fix for out-of-bounds access error with regionoffsets. Breaks compatibility.
2010-03-31 18:16:18 +02:00
eccdc6896e
Fix argstream.h
2010-03-30 04:43:06 +02:00
71fc49897f
Accelerated creatures work on Windows
...
Refactored vector reading, proper length of vectors from MSVC9 is known (0x18, triplet starts at 0xC)
2010-03-30 02:26:52 +02:00
85d347442d
Accelerated reading of creatures
2010-03-28 17:22:15 +02:00
6522d0c498
Even more fixes for random crashes in some less common cases (DF in the menu, etc...)
2010-03-26 13:38:49 +01:00
4d939363b5
Many fixes to DFHack tools and examples
2010-03-26 13:01:46 +01:00
517aa0e6e3
Merge branch 'master' of git://github.com/Zhentar/dfhack
...
Conflicts:
examples/CMakeLists.txt
library/DFHackAPI.cpp
Also added offsets for all supported versions
2010-03-26 02:40:17 +01:00
f0edb0c33d
Map block flags added to the API
...
Added a RAMP_TOP tile shape, ramp characters for veinlook
Merged in the magma_create util by Aleric, tweaked it a bit, made it use the block flags
2010-03-26 00:42:07 +01:00
dbeb342c6a
Make the python wrapper compile again
2010-03-25 22:13:56 +01:00
822265443c
Make the API a bit saner about the used data types and structures
2010-03-25 21:37:09 +01:00
13fcdb8b8f
Fix one more InitReadNames call
2010-03-23 00:37:35 +01:00
efadfe98b2
Add some more exception handling to InitRead API methods
2010-03-23 00:35:23 +01:00
4287abbc94
Add pregnancy and blood stuff to the creature struct
2010-03-21 15:47:24 -05:00
71f8474e11
Added reading/writing support for effects like mist
...
Veinlook shows effects for it's middle block
Veinlook now uses wide-character ncurses
2010-03-20 17:30:13 +01:00
c283197b71
Flush input in veinlook, so it doesn't 'lag' so bad
2010-03-18 20:05:32 +01:00
d2afd21318
Stop synchronous suspend from eating CPU cycles.
...
Untested on windows.
Breaks the SHM protocol. New SHM server library is required.
2010-03-18 19:55:01 +01:00
df4de4a333
Detach in API destructor
2010-03-16 22:12:05 +01:00
a2eb3a6892
add iostream to DFProcess.h include, std:: prefix to the output line, DT was getting mad about them not being defined
2010-03-14 20:28:36 -04:00
e4dc165954
Merge branch 'shm-multi'
2010-03-14 23:17:54 +01:00
5fe279d8ec
Added a cache mechanism to vtable lookups
...
Fixed python bindings (build, not actual functionality)
Fixed building subtypes on linux
2010-03-14 22:58:28 +01:00
12abef8ace
used different creature vector than before, this is the correct one, the old one was missing some creatures, and the current_creature index was not right, also found the offsets for mood and artifacts for 40d
...
Everything should work now from 40d,40d2->40d19 on windows, linux was already done before
I also modified creaturedump.cpp to show mood and aritifacts if a creature has one, also the mood is now a int rather than a uint, as we check for -1
2010-03-14 13:21:52 -04:00
310669737e
Port multiple client SHM to Windows
2010-03-13 17:44:36 +01:00
0582354191
Merge remote branch 'remotes/peterix/master' into version_compatiblity
...
trying merge
Conflicts:
examples/creaturedump.cpp
output/Memory.xml
2010-03-13 08:45:30 -05:00
834a64c282
Fix horrible race conditions in suspend and resume
2010-03-12 18:29:11 +01:00
791ac8dd75
modify the renamer and creature dump to output the new current cursor creature code
2010-03-12 09:21:45 -05:00
Japa
lethosor
Quietust
Lethosor
Carter Bray
Vitaly Pronkin
Michael Casadevall
Ben Rosser
Ben Lubar
Warmist
Japa
expwnent
sv-esk
James Gilles
DoctorVanGogh
Ross Morgan-Linial
Chris Dombroski
Eric Wald
Timothy Collett
Casey Link
Alexander Gavrilov
quipyowert
expwnent
expwnent
Alexander "Ace" Olofsson
Pierre-David Bélanger
jj
Tareq A Khandaker
expwnent
Putnam3145
Mikko Juola
Petr Mrázek
Kelly Martin
Alexander Gavrilov
jj
Timothy Collett
harlanplayford
Caldfir
Jared Adams
Will Rogers
Robert Heinrich
Clayton Hughes
Priit Laes
Mike Stewart
Mike Stewart
Espen Wiborg
gsvslto
Matthew Cline
zilpin
doomchild
Tom Prince
reverb
belal
belal
thewonderidiot
Mikko Juola
simon
Simon Jackson
doomchild
unknown
Zhentar