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
|
091bf62aa8
|
DFhackCExport is only needed on the plugin_* functions
|
2012-02-13 22:54:08 -06: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 |
Mike Stewart
|
9163dda076
|
Missing newline in mapexport help output.
|
2012-02-12 18:42:25 -08:00 |
|
Mike Stewart
|
1b3d517a61
|
Fixed material output -- material_type and material_index were being used backwards.
|
2012-02-12 18:39:43 -08: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 |
|
Alexander Gavrilov
|
f469fab1e6
|
Use globals defined by the latest codegen.
|
2012-02-11 16:27:12 +04:00 |
|
Petr Mrázek
|
aee5efe7c0
|
Make it run on Windows, re-added more missing globals to memory.xml
|
2012-02-10 02:35:51 +01:00 |
|
Quietust
|
952f621ee2
|
Synchronize with df-structures
|
2012-02-08 22:35:22 -06:00 |
|
Petr Mrázek
|
8f680dcf94
|
Make it build and run on linux (no stonesense, df2mc, dfusion)
|
2012-02-09 03:07:26 +01:00 |
|
Petr Mrázek
|
f7d8635be1
|
Remove fat from memory.xml, simplify memory.xml loading, break
everything.
|
2012-02-08 13:22:42 +01:00 |
|
Quietust
|
0d11d1b79c
|
Synch with structures changes
|
2012-02-07 15:37:21 -06:00 |
|
Petr Mrázek
|
1ae1549513
|
Tag 31.25-r9b
|
2012-02-06 10:30:09 +01:00 |
|
Petr Mrázek
|
0a5ee01f6e
|
update structures
|
2012-02-06 10:04:58 +01:00 |
|
Petr Mrázek
|
8f1a2ebf7f
|
Added missing keybinding mention to 'ls', DFusion hotfix.
|
2012-02-06 04:47:13 +01:00 |
|
Petr Mrázek
|
0c79682fc5
|
Update structures
|
2012-02-06 01:35:07 +01:00 |
|
Petr Mrázek
|
e3e94437f3
|
Add export tools to readme.
|
2012-02-06 01:12:23 +01:00 |
|
Petr Mrázek
|
20b1d09fdc
|
Merge https://github.com/mikestewart/dfhack
|
2012-02-05 23:04:06 +01:00 |
|
Mike Stewart
|
cdb171e9b1
|
Fixed an issue with hidden plants.
|
2012-02-05 13:51:49 -08:00 |
|
Petr Mrázek
|
e7f8e539f7
|
Update structures
|
2012-02-05 20:51:15 +01:00 |
|
Petr Mrázek
|
6fe0867c46
|
Rename export to dwarfexport.
|
2012-02-05 20:41:12 +01:00 |
|
Petr Mrázek
|
2b22b0b336
|
Make dwarf export optional. Update structures.
|
2012-02-05 20:16:00 +01:00 |
|
Petr Mrázek
|
7d8a176e59
|
Merge branch 'export-plugin' of https://github.com/espenhw/dfhack
|
2012-02-05 20:05:19 +01:00 |
|
Petr Mrázek
|
1bcf96f4e8
|
Update structures
|
2012-02-05 19:55:32 +01:00 |
|
Petr Mrázek
|
71b29b67cf
|
Merge https://github.com/mikestewart/dfhack
|
2012-02-05 19:50:15 +01:00 |
|
Alexander Gavrilov
|
30bb98d9f5
|
Document the keybinding command.
|
2012-02-05 19:25:06 +04:00 |
|
Alexander Gavrilov
|
60a87d8c33
|
Fix the copystock command name.
|
2012-02-05 16:25:44 +04:00 |
|
Alexander Gavrilov
|
ec5f3cc4b3
|
Update fixpositions to match the new data definition naming.
|
2012-02-05 16:13:19 +04:00 |
|
Mike Stewart
|
6ac50fccbd
|
Fixed mapexport's plant saving.
|
2012-02-04 23:51:26 -08:00 |
|
Quietust
|
2b4246feb6
|
Add fixpositions commands, update some other descriptions, move builtin commands to the top, and reorganize a few others (alphabetically, by the name of the plugins in which they reside)
|
2012-02-04 23:19:35 -06:00 |
|
Petr Mrázek
|
e51e4f6bd2
|
More docs work.
|
2012-02-05 06:02:44 +01:00 |
|
Petr Mrázek
|
ebeae664d7
|
Merge https://github.com/mikestewart/dfhack
|
2012-02-05 04:28:53 +01:00 |
|
Petr Mrázek
|
b79c6880e2
|
Merge https://github.com/quietust/dfhack
|
2012-02-05 04:28:37 +01:00 |
|
Petr Mrázek
|
8ddc2f87c9
|
Update docs.
|
2012-02-05 04:28:20 +01:00 |
|
Quietust
|
e9118dceeb
|
Add fixpositions plugin - adds Elven Diplomats and Human Merchant Nobles to existing worlds
|
2012-02-04 20:45:45 -06:00 |
|
Quietust
|
4c8717477c
|
Fix really stupid typo
|
2012-02-04 16:38:54 -06:00 |
|
Mike Stewart
|
b9020a70a9
|
Merge.
|
2012-02-04 13:08:08 -08:00 |
|
Mike Stewart
|
e5b2c78122
|
Added plant and material export to mapexport, and made constructions have the proper material.
|
2012-02-04 13:05:41 -08:00 |
|
Petr Mrázek
|
5ad9274689
|
Update structures, stonesense.
|
2012-02-04 21:17:52 +01:00 |