Commit Graph

973 Commits (6ac50fccbd4407e4e7cdd0ac26616dc8cb776f37)

Author SHA1 Message Date
Mike Stewart 4b3a2bfe05 Merge. 2012-02-03 23:29:05 -08:00
Petr Mrázek 2ff994c18f Make perl executable tweakable. 2012-02-04 03:43:14 +01:00
Alexander Gavrilov 878bc3d3a1 Implement pre-embark estimate in prospector.
Requires careful tuning of the vein density computation.
2012-02-02 22:14:49 +04:00
Petr Mrázek 22aeb6e2ac Added linkage to libdl, fix for mode. 2012-02-01 04:12:15 +01:00
Mike Stewart 7d55b84545 Merge remote-tracking branch 'upstream/master' 2012-01-31 11:45:20 -08:00
Petr Mrázek e5b1433d44 Update structures. 2012-01-31 18:52:02 +01:00
Quietust 9afcea3deb In all loops that iterate across a vector, use a size_t as the index 2012-01-31 10:55:38 -06:00
Mike Stewart 09f197fa6d Fixed mapexport build on Linux. 2012-01-31 08:42:25 -08:00
Quietust a82f4c9138 Cleanup code to get rid of MSVC warning C4482 2012-01-31 10:17:27 -06:00
Mike Stewart dcc02506b7 Merge remote-tracking branch 'quietust/master' 2012-01-29 12:05:30 -08:00
Mike Stewart 3dece3395d Merge remote-tracking branch 'upstream/master' 2012-01-29 12:04:33 -08:00
Quietust 70454842ae Add missing direction indicators to smooth wall tiles, and cleanup spacing 2012-01-29 11:38:34 -06:00
Alexander Gavrilov e5be2c75c2 Merge remote-tracking branch 'q-github/master' 2012-01-29 14:14:05 +04:00
Mike Stewart 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
Mike Stewart bd26c54259 Merge remote-tracking branch 'quietust/master' 2012-01-28 13:33:26 -08:00
Mike Stewart b07d3b25b5 Merge upstream/master 2012-01-28 13:32:48 -08:00
Quietust 8a4740c479 Make all "origin" fields strongly typed, and fix building.origin to actually be meaningful 2012-01-28 14:12:41 -06:00
Quietust 9e40228767 Adjust Maps typedefs a bit 2012-01-28 13:54:59 -06:00
Alexander Gavrilov fa4fb4b407 Modify a number of commands to use CR_WRONG_USAGE for displaying help. 2012-01-28 16:03:56 +04:00
Quietust 69b8f168cc Improve Translation::isValid() - make sure world exists 2012-01-27 22:01:59 -06:00
Quietust 34f9d98d45 Simplify TranslateName a bit using a helper function 2012-01-27 21:46:52 -06:00
Quietust 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
Mike Stewart b89cd43b85 More work on getting the map exporter up to speed. 2012-01-27 17:32:52 -08:00
Quietust ccad6efeb8 Remove UTF-8 BOMs 2012-01-27 09:47:14 -06:00
Quietust 5521459fc1 "unknown1" was renamed to "body_info" 2012-01-27 09:41:51 -06:00
Petr Mrázek 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
Petr Mrázek d5d4875532 Make things work properly. 2012-01-27 05:54:26 +01:00
Quietust be892beba9 Update materials module to match XML changes 2012-01-26 21:32:47 -06:00
Quietust 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
Quietust 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
Petr Mrázek 0375be549c Merge https://github.com/mikestewart/dfhack 2012-01-26 05:37:50 +01:00
Petr Mrázek 850ede3e72 Sync structures. 2012-01-26 05:36:35 +01:00
Quietust 3c60b43a38 Fix "origin" field on mapblock40d to actually be correct 2012-01-25 07:57:11 -06:00
Quietust 902e0c4d90 Strip out old offsets from Gui module and use df::global vars where available 2012-01-24 22:18:21 -06:00
Quietust 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
Quietust 26730dc6c2 Kill the Constructions module 2012-01-24 16:11:48 -06:00
Mike Stewart e68cdee95b Merge remote-tracking branch 'quietust/master' 2012-01-24 12:27:38 -08:00
Quietust 8861e93848 Kill the Vegetation module, replacing it with the same 3 simple methods used in Engravings 2012-01-24 12:02:12 -06:00
Quietust 6d1af090c5 Tweak Engravings.h 2012-01-24 11:57:47 -06:00
Quietust f8ce959402 Kill the Engravings module 2012-01-24 11:53:49 -06:00
Quietust 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
Quietust 02d75e2c94 Building module is gone, so this function doesn't exist anymore 2012-01-24 10:59:26 -06:00
Quietust 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
Quietust 466bf89578 Goodbye, Translation module 2012-01-24 10:54:12 -06:00
Alexander Gavrilov 174d9d0739 Tweak showmood, add a few validity checks, commit a dfhack.init example. 2012-01-24 15:36:30 +04:00
Quietust 6adadb396e df::tool_uses is now implicitly int16_t, so no more enum_field<> here 2012-01-23 19:40:02 -06:00
Mike Stewart 031119ac73 Made mapexport build with latest Material changes. 2012-01-22 15:47:39 -08:00
Mike Stewart 0d79fd9b15 Merge remote-tracking branch 'quietust/master' 2012-01-22 15:31:34 -08:00
Quietust 7f23c322a2 Cleanup 2012-01-21 19:24:58 -06:00
Quietust 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