Espen Wiborg
|
cfb975a522
|
Track upstream changes
|
2012-01-27 12:06:57 +01:00 |
Espen Wiborg
|
26880d9108
|
Merge branch 'master' into export-plugin
|
2012-01-27 11:00:34 +01:00 |
Espen Wiborg
|
018f4083a3
|
Merge git://github.com/peterix/dfhack
|
2012-01-27 10:59:57 +01: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
|
be51221939
|
Add plugin "fixveins", restores mineral floors that were erased by placing/removing constructions
|
2012-01-26 10:06:03 -06:00 |
Quietust
|
40b82d4e6c
|
Fix compilation of mapexport - was trying to load the old Vegetation module (even though it didn't actually use it)
|
2012-01-26 09:58:24 -06:00 |
Espen Wiborg
|
b6ef14bafa
|
Merge branch 'master' into export-plugin
|
2012-01-26 13:57:01 +01:00 |
Espen Wiborg
|
b48c110438
|
Merge git://github.com/peterix/dfhack
|
2012-01-26 13:56:45 +01:00 |
Petr Mrázek
|
0375be549c
|
Merge https://github.com/mikestewart/dfhack
|
2012-01-26 05:37:50 +01:00 |
Quietust
|
fbadb3ee33
|
Removed unused var
|
2012-01-24 16:13:55 -06: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
|
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
|
466bf89578
|
Goodbye, Translation module
|
2012-01-24 10:54:12 -06:00 |
Quietust
|
06547c8948
|
Update showmood to recognize corpses (fell mood) and remains (macabre mood)
|
2012-01-24 10:03:28 -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
|
6502f0f6ae
|
Print mood item flags if it's an unrecognized body part
|
2012-01-23 16:08:37 -06:00 |
Quietust
|
e3f875b9a5
|
Add "showmood" plugin, provides a detailed description of the currently
active mood (if any)
|
2012-01-23 16:03:29 -06:00 |
Espen Wiborg
|
8e2fef0c97
|
Merge branch 'master' into export-plugin
|
2012-01-23 10:43:24 +01:00 |
Espen Wiborg
|
0cf3ee3dc6
|
Merge branch 'master' of git://github.com/peterix/dfhack
|
2012-01-23 10:43:07 +01:00 |
Mike Stewart
|
5bf5908582
|
Made liquids not crash when a map isn't loaded.
|
2012-01-22 15:47:58 -08: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
|
2cc6bcf0e9
|
Use CoreSuspender and namespace df::enums
|
2012-01-21 18:31:15 -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 |
Mike Stewart
|
debeebb7c4
|
Merge remote-tracking branch 'quietust/master'
|
2012-01-21 11:26:12 -08:00 |
Quietust
|
7b2835e2a9
|
Get rid of df_name
|
2012-01-21 13:12:40 -06:00 |
Quietust
|
8052305c2e
|
Cleanup the Units module
|
2012-01-21 13:03:39 -06:00 |
Quietust
|
118e5c6617
|
Major cleanup of Materials modul, precursor to eventually nuking it
|
2012-01-21 10:12:26 -06:00 |
Mike Stewart
|
df08914549
|
Better fix for building protobufs with C++0x turned on.
|
2012-01-20 16:21:50 -08:00 |
Mike Stewart
|
f02f4510dd
|
Added very basic export functionality to mapexport, taken almost directly from prospector. Only tile shapes are exported for now.
|
2012-01-20 14:51:51 -08:00 |
Mike Stewart
|
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 |
Mike Stewart
|
9b0b0d53f9
|
Merge remote-tracking branch 'quietust/master'
|
2012-01-20 09:47:32 -08:00 |
Mike Stewart
|
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 |
Quietust
|
1b419313f4
|
Merge https://github.com/angavrilov/dfhack
|
2012-01-20 10:40:25 -06:00 |
Alexander Gavrilov
|
3a908eb64b
|
Support reporting the Z range of holes in the adamantine tubes.
|
2012-01-20 20:29:51 +04:00 |
Quietust
|
cbac8259ed
|
Fix unreveal
|
2012-01-20 10:13:34 -06:00 |
Alexander Gavrilov
|
cc510a2c4b
|
Replace DFCoord with df::coord and df::coord2d.
|
2012-01-20 14:28:00 +04:00 |
Mike Stewart
|
fb41e457c4
|
Added a plugin that starts up and shuts down protobufs. Will add actual map export functionality to it tomorrow.
|
2012-01-19 22:15:51 -08:00 |
Quietust
|
d35d070ff3
|
Only skip refilling tiles beneath non-featstone tiles if said tiles don't already have floors; also skip tiles filled with liquid
|
2012-01-19 22:41:59 -06:00 |
Quietust
|
7da633b6ef
|
Optimize reveal - instead of walking the entire map, just iterate across the list of blocks
|
2012-01-19 22:36:34 -06:00 |
Quietust
|
9dddb79165
|
Optimize tubefill, and also try to handle the floors above newly filled tiles (as well as tiles which were floors to begin with)
|
2012-01-19 22:34:06 -06:00 |
Quietust
|
3a11d0c86e
|
Switch deramp to using Maps::getBlockAbs()
|
2012-01-19 22:12:51 -06:00 |
Quietust
|
6a000811aa
|
Cleanowned doesn't touch the Maps module
|
2012-01-19 22:12:26 -06:00 |
Quietust
|
e7ecda1434
|
Kill the Maps module
|
2012-01-19 21:44:17 -06:00 |
Quietust
|
4bb724cd6c
|
Significant cleanup of Maps module - next step will be to kill it properly
|
2012-01-19 14:11:52 -06:00 |
Alexander Gavrilov
|
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 |
Alexander Gavrilov
|
d75292acc7
|
Merge remote-tracking branch 'q-github/master'
|
2012-01-19 12:07:00 +04:00 |
Quietust
|
35ad84c58a
|
angavrilov changed general_ref_type to be all uppercase
|
2012-01-18 08:26:08 -06:00 |
Alexander Gavrilov
|
1aec9649c5
|
Support including material value in the prospector output.
|
2012-01-17 20:04:54 +04:00 |