Mike Stewart
|
b07d3b25b5
|
Merge upstream/master
|
2012-01-28 13:32:48 -08:00 |
Mike Stewart
|
b89cd43b85
|
More work on getting the map exporter up to speed.
|
2012-01-27 17:32:52 -08: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
|
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 |
|
Mike Stewart
|
031119ac73
|
Made mapexport build with latest Material changes.
|
2012-01-22 15:47:39 -08: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
|
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 |
|
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 |