Mike Stewart
|
baea253578
|
Merge remote-tracking branch 'upstream/master'
|
2012-02-21 23:31:53 -08:00 |
Mike Stewart
|
14b471a459
|
Add ability menu/area map width reading and writing to the Gui module, and use the new information in follow to properly center the screen regardless of menu configuration. Also general fixing and cleanup in follow.
|
2012-02-21 23:30:44 -08:00 |
Petr Mrázek
|
34c9c2d663
|
Fix stonesense, MSVC fail
|
2012-02-21 18:30:31 +01:00 |
Petr Mrázek
|
2cd2ee9b0c
|
New plugin interface
|
2012-02-21 18:19:17 +01:00 |
Petr Mrázek
|
0b9e849096
|
Update submodules, sort 'ls' output.
|
2012-02-21 15:21:50 +01:00 |
Petr Mrázek
|
931121e5fd
|
Update structures
|
2012-02-20 17:55:33 +01:00 |
Alexander Gavrilov
|
02e486be88
|
Support the new unitlist screen; it's same as joblist, but with pages.
|
2012-02-20 17:53:39 +04:00 |
Petr Mrázek
|
80cedd2ff8
|
Fix header includes, update structures.
|
2012-02-20 11:42:40 +01:00 |
Petr Mrázek
|
7c7cf0b302
|
Don't throw exceptions on dummy global-address elements.
|
2012-02-20 08:30:33 +01:00 |
Petr Mrázek
|
33f77c8837
|
Merge https://github.com/quietust/dfhack
|
2012-02-19 20:28:08 +01:00 |
Petr Mrázek
|
252895708f
|
Fixage.
|
2012-02-19 20:27:44 +01:00 |
Petr Mrázek
|
27e3e0f2c2
|
Update submodules
|
2012-02-19 20:08:29 +01:00 |
Quietust
|
d394dc406b
|
Update t_building, change subtype into a union of all possible subtypes (depending on type)
|
2012-02-18 11:34:52 -06:00 |
Petr Mrázek
|
1511a6b7ed
|
Use hexadecimal numbers in tilesieve
|
2012-02-18 15:07:55 +01:00 |
Petr Mrázek
|
fa6ec63535
|
Add zoom to kittens, fix tilesieve.
|
2012-02-17 05:30:34 +01:00 |
Petr Mrázek
|
28059a7f35
|
Tilesieve devel tool
|
2012-02-16 16:22:05 +01:00 |
Petr Mrázek
|
1bf5080828
|
Fixage. Runs with 34.01
|
2012-02-15 21:35:44 +01:00 |
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 |
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 |
Mike Stewart
|
debeebb7c4
|
Merge remote-tracking branch 'quietust/master'
|
2012-01-21 11:26:12 -08:00 |
Quietust
|
d2c78646ea
|
t_creaturecaste shouldn't be using t_attrib, because those AREN'T actual attribute values, just the PHYS/MENT_ATT_RANGE values from the raws
|
2012-01-21 13:24:38 -06: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 |