Commit Graph

1137 Commits (40cf5fe53842d518b2f4f616a3555188e1694896)

Author SHA1 Message Date
Quietust 4d66218783 Update bprobe to print civzone subtypes 2012-03-15 20:09:56 -05:00
Petr Mrázek c72fb76316 MSVC fixage for the new socket API 2012-03-15 22:05:33 +01:00
Quietust 52aca6e05a Rename "interface" to "interfacest" and just avoid all of these MSVC problems 2012-03-15 13:00:47 -05:00
Quietust 57a41a0deb Fix indentation 2012-03-15 11:50:38 -05:00
Alexander Gavrilov f84b1539a8 Change to the traits representation of enum and bitfield properties. 2012-03-15 20:46:08 +04:00
Petr Mrázek e5efbc5895 Merge https://github.com/angavrilov/dfhack 2012-03-15 15:40:35 +01:00
Petr Mrázek 1ac8025025 Merge https://github.com/angavrilov/dfhack
Conflicts:
	plugins/workflow.cpp
2012-03-15 14:43:05 +01:00
Alexander Gavrilov 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
Alexander Gavrilov 605ee9669a Plugin-exported functions now actually work. 2012-03-15 14:06:50 +04:00
Alexander Gavrilov 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
Alexander Gavrilov e7851f5abd Improve support for void RPC functions, dfhack-run, etc. 2012-03-15 11:07:43 +04:00
Alexander Gavrilov 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
Alexander Gavrilov c42e2ff053 Support crafts and add a couple of options in workflow. 2012-03-14 12:09:02 +04:00
Alexander Gavrilov a05cbcc2de Rename the world substruct with the save directory name. 2012-03-14 10:56:30 +04:00
Petr Mrázek 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
Quietust 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
Quietust 8e933fb75e Ignore the .rule file too 2012-03-13 12:17:00 -05:00
Petr Mrázek 9079ffa4ff Add clsocket as a dependency for dfhack lib. 2012-03-13 17:10:46 +01:00
Petr Mrázek eb4757043b Move depends out of main library, make them (static) libraries. 2012-03-13 14:46:48 +01:00
Petr Mrázek b3f6bccdf6 Merge branch 'cleanups' of https://github.com/plaes/dfhack 2012-03-12 15:05:44 +01:00
Petr Mrázek ea8a2ad9a2 Remove references to never implemented commands... 2012-03-12 15:05:23 +01:00
Clayton Hughes 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
Clayton Hughes 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
Petr Mrázek db93b548db Check for a valid plugin_shutdown function when unloading plugins
Fixes related segfault
2012-03-11 23:07:38 +01:00
Petr Mrázek 32cc4c8928 Fix MSVC build error related to min and max macros
Tinythread was leaking those.
2012-03-10 20:47:10 +01:00
Petr Mrázek 75113b715a Misc fixes for warnings... 2012-03-10 16:03:11 +01:00
Petr Mrázek cff654bca6 Track structures 2012-03-10 15:51:50 +01:00
Petr Mrázek 003a0f9eb8 Merge https://github.com/angavrilov/dfhack 2012-03-10 15:51:45 +01:00
Petr Mrázek 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
Alexander Gavrilov 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
Alexander Gavrilov b2737e2bed Pull out a colored text output interface out of the Console class. 2012-03-10 13:29:33 +04:00
Petr Mrázek c260aca3f1 Merge https://github.com/angavrilov/dfhack 2012-03-10 02:15:34 +01:00
Alexander Gavrilov 75c569b097 Add some experimental message definitions to the main library. 2012-03-09 21:42:22 +04:00
Alexander Gavrilov 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
Clayton Hughes 47bbe1a3ff Fixed up formatting, debug messages in new Windows Hotkey stuff. 2012-03-09 01:07:47 -08:00
Clayton Hughes 3d1ce32785 Windows now detects hotkeys using the correct keyboard layout. 2012-03-09 00:56:09 -08:00
Petr Mrázek 3598282ed7 Update readme, track df2mc and structures 2012-03-07 23:40:22 +01:00
Petr Mrázek b6df6c2eff Track structures 2012-03-07 21:02:46 +01:00
Alexander Gavrilov 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
Petr Mrázek f83db86258 Use tile buffers! 2012-03-05 02:24:02 +01:00
Petr Mrázek a45fc82743 First pass at windowing, track df2mc, stonesense 2012-03-05 01:34:04 +01:00
Petr Mrázek 6aa2a3e676 Track structures 2012-03-04 11:58:41 +01:00
Petr Mrázek 99abd4102d Merge https://github.com/quietust/dfhack 2012-03-04 11:58:37 +01:00
Petr Mrázek d33e9a9770 Sort layer materials in prospector by depth. 2012-03-03 23:18:12 +01:00
Quietust 2b2c30ac43 DEEP_ANY got renamed to SPECIAL 2012-03-03 16:03:35 -06:00
Petr Mrázek 7fe8762852 Get rid of Simple namespace, Gui module is now a namespace. 2012-03-03 14:38:24 +01:00
Petr Mrázek 022822277d Fix the ugly Materials code... 2012-03-01 01:52:13 +01:00
Petr Mrázek 2682c54fce Fix horrible errors and make MSVC shut upt about non-issues. 2012-03-01 01:29:55 +01:00
Petr Mrázek c6fd508ee3 Fix possible source of vile errors. 2012-03-01 00:33:11 +01:00
Petr Mrázek a322b3ad87 Track structures 2012-02-29 17:44:51 +01:00
Petr Mrázek f0fc0d4428 Bump version to 0.34.03-r1, update docs to list new plugins. 2012-02-28 22:30:55 +01:00
Petr Mrázek a13717212a Track structures 2012-02-28 19:05:55 +01:00
Petr Mrázek d1a1c790ec Paint DFHack in corner if supported. 2012-02-28 18:19:13 +01:00
Petr Mrázek 95ac3db542 Fix normal hooks. 2012-02-28 12:59:02 +01:00
Petr Mrázek 731472a478 Add eggy hooks (linux only for now) 2012-02-28 03:37:56 +01:00
Petr Mrázek f8721c88b5 dev version. update structures, stonesense 2012-02-27 20:10:31 +01:00
Petr Mrázek 8afafd0430 Get rid of ntdll, update stonesense 2012-02-25 22:59:32 +01:00
Petr Mrázek 75bec0dfb2 fix spatter objects 2012-02-25 21:17:45 +01:00
Alexander Gavrilov 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
Priit Laes 1299b0d4c6 Don't compile Lua on UNIX 2012-02-23 13:49:07 +02:00
Petr Mrázek 6696e79838 Disable 34.01 symbol tables 2012-02-23 09:02:10 +01:00
Petr Mrázek 2b761e450f Add the init file to builds, mention it in readme. 2012-02-23 08:57:11 +01:00
Petr Mrázek 2371b93b3d move sortable to top level 2012-02-22 23:22:41 +01:00
Petr Mrázek 390859dd98 Update xml 2012-02-22 22:58:33 +01:00
Petr Mrázek 58e3813d56 Fix more MSVC fail, make console recognize 'man' command. 2012-02-22 19:54:07 +01:00
Petr Mrázek a9c9ac98fe Silence some MSVC warnings. 2012-02-22 19:28:40 +01:00
Petr Mrázek 15cc08debc Fix the fail. 2012-02-22 19:02:06 +01:00
Petr Mrázek 0807baf0c0 Merge https://github.com/mikestewart/dfhack 2012-02-22 15:22:19 +01:00
Petr Mrázek 8ee27e182a Hidden weather command raw value override 2012-02-22 15:21:29 +01:00
Mike Stewart baea253578 Merge remote-tracking branch 'upstream/master' 2012-02-21 23:31:53 -08:00
Mike Stewart 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
Petr Mrázek 34c9c2d663 Fix stonesense, MSVC fail 2012-02-21 18:30:31 +01:00
Petr Mrázek 2cd2ee9b0c New plugin interface 2012-02-21 18:19:17 +01:00
Petr Mrázek 0b9e849096 Update submodules, sort 'ls' output. 2012-02-21 15:21:50 +01:00
Petr Mrázek 931121e5fd Update structures 2012-02-20 17:55:33 +01:00
Alexander Gavrilov 02e486be88 Support the new unitlist screen; it's same as joblist, but with pages. 2012-02-20 17:53:39 +04:00
Petr Mrázek 80cedd2ff8 Fix header includes, update structures. 2012-02-20 11:42:40 +01:00
Petr Mrázek 7c7cf0b302 Don't throw exceptions on dummy global-address elements. 2012-02-20 08:30:33 +01:00
Petr Mrázek 33f77c8837 Merge https://github.com/quietust/dfhack 2012-02-19 20:28:08 +01:00
Petr Mrázek 252895708f Fixage. 2012-02-19 20:27:44 +01:00
Petr Mrázek 27e3e0f2c2 Update submodules 2012-02-19 20:08:29 +01:00
Quietust d394dc406b Update t_building, change subtype into a union of all possible subtypes (depending on type) 2012-02-18 11:34:52 -06:00
Petr Mrázek 1511a6b7ed Use hexadecimal numbers in tilesieve 2012-02-18 15:07:55 +01:00
Petr Mrázek fa6ec63535 Add zoom to kittens, fix tilesieve. 2012-02-17 05:30:34 +01:00
Petr Mrázek 28059a7f35 Tilesieve devel tool 2012-02-16 16:22:05 +01:00
Petr Mrázek 1bf5080828 Fixage. Runs with 34.01 2012-02-15 21:35:44 +01:00
Petr Mrázek 448e270421 Merge https://github.com/quietust/dfhack
Conflicts:
	plugins/mapexport/mapexport.cpp
2012-02-14 09:59:33 +01:00
Petr Mrázek bdbfbf5988 Fix catsplosion. 2012-02-14 09:37:30 +01:00
Quietust 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
Quietust 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
Quietust b152a40e83 Fix remaining issues 2012-02-13 19:56:55 -06:00
Quietust d15d38d536 Finish conversion, fix compile errors 2012-02-13 19:17:38 -06:00
Quietust d0a8c2edd8 Move TileTypes to XML, part 1 - a bunch of stuff is now broken 2012-02-13 16:56:33 -06:00
Petr Mrázek f600928ec1 Move catsplosion, tweak for build targets under MSVC. 2012-02-13 17:43:41 +01:00
Quietust 9f43d61c2c Fix MapCache crash when in Arena mode 2012-02-13 09:56:35 -06:00
Alexander Gavrilov e39852ff2e Make BitArray(unsigned) treat the argument as the number of bytes. 2012-02-12 18:06:00 +04:00
Alexander Gavrilov 1047c2517d Add size-defining constructors for BitArray. 2012-02-12 17:44:19 +04:00
Alexander Gavrilov 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
Petr Mrázek ed53ee7031 Update to use the new symbols file. 2012-02-11 19:24:44 +01:00
Petr Mrázek 8527547cbe Merge branch 'master' into purge
Conflicts:
	library/DataDefs.cpp
2012-02-11 18:48:17 +01:00