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
|
2cd2ee9b0c
|
New plugin interface
|
2012-02-21 18:19:17 +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
|
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
|
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 |
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 |
Quietust
|
a82f4c9138
|
Cleanup code to get rid of MSVC warning C4482
|
2012-01-31 10:17:27 -06: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 |
Quietust
|
ccad6efeb8
|
Remove UTF-8 BOMs
|
2012-01-27 09:47:14 -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
|
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 |
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
|
26730dc6c2
|
Kill the Constructions module
|
2012-01-24 16:11:48 -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
|
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
|
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
|
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 |
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 |
Quietust
|
d504479fc2
|
Merge https://github.com/angavrilov/dfhack
|
2012-01-21 09:59:54 -06:00 |
Quietust
|
d9c4f259a0
|
These will become necessary shortly
|
2012-01-21 08:59:19 -06:00 |
Alexander Gavrilov
|
b0cda1526e
|
Adjust FOR_ENUM_ITEMS to account for ENUM_LAST_ITEM being inclusive now.
|
2012-01-21 18:50:44 +04:00 |
Alexander Gavrilov
|
2449b80010
|
Update to match the data definitions.
|
2012-01-21 17:18:53 +04:00 |