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 |
|
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
|
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
|
e7f8e539f7
|
Update structures
|
2012-02-05 20:51:15 +01:00 |
|
Petr Mrázek
|
2b22b0b336
|
Make dwarf export optional. Update structures.
|
2012-02-05 20:16:00 +01:00 |
|
Petr Mrázek
|
1bcf96f4e8
|
Update structures
|
2012-02-05 19:55:32 +01:00 |
|
Alexander Gavrilov
|
ec5f3cc4b3
|
Update fixpositions to match the new data definition naming.
|
2012-02-05 16:13:19 +04:00 |
|
Petr Mrázek
|
e51e4f6bd2
|
More docs work.
|
2012-02-05 06:02:44 +01:00 |
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 |