3403146461
Merge remote-tracking branch 'peterix/master'
...
Conflicts:
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
83a9e5c837
autoSyndrome: added reset policies, allowing modders to specify what to do if a unit already has the syndrome in question.
2013-05-25 14:26:42 -04:00
22f31ca3ad
workNow tweaks
2013-05-25 12:23:38 -04:00
638b2e974c
EventManager: cleaned up manageEvents considerably, using a function pointer array.
2013-05-25 12:19:54 -04:00
bcaaa72387
EventManager should use a CoreSuspender just in case.
2013-05-25 11:50:43 -04:00
5cca0b84a3
fastdwarf: made it work better when both fastdwarf and teledwarf are enabled.
2013-05-25 11:07:59 -04:00
141043363d
autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly.
2013-05-25 10:20:22 -04:00
b44cd86dc9
EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.
2013-05-25 09:44:17 -04:00
01c311cf13
Weird compilation error.
2013-05-24 15:55:40 -04:00
170fe6a0ef
autoSyndrome/syndromeTrigger: made things off by default.
2013-05-24 15:55:19 -04:00
f92e859f49
trueTransformation readme tweak.
2013-05-12 14:06:48 -04:00
93a31134e1
autoSyndrome/syndromeTrigger: fixed up readme.
2013-05-12 13:55:54 -04:00
63e1f61f4f
autoSyndrome/syndromeTrigger: deal with overlap better for commands.
2013-05-12 12:43:45 -04:00
4ae8594fca
Merge pull request #7 from tareqak/add_missing_entries_from_splintermind_attributes
...
Add & correct offsets for splintermind-attributes
2013-05-12 01:19:44 -07:00
c127ad052e
autoSyndrome and syndromeTrigger documentation.
2013-05-11 19:20:02 -04:00
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
89d91eddb6
Add & correct offsets for splintermind-attributes
2013-05-11 13:08:01 -04:00
cafa966be4
Subtract the ASLR rebase delta in the export-dt-ini script.
2013-05-09 18:58:52 +04:00
8924d7e7a6
Merge pull request #5 from tareqak/add_missing_entries_from_splintermind_attributes
...
Add entries to match splintermind-attributes DT
2013-05-09 07:34:33 -07:00
29c77ff85a
Add entries to match splintermind-attributes DT
...
The added address/offset entries correspond to those found in the
splintermind-attributes branch of Dwarf Therapist for Dwarf Fortress v0.34.11
SDL (windows).
These entries can be found the following location:
https://code.google.com/r/splintermind-attributes/source/detail?spec=svneeeac8544d94c133ef2eb7c9a4ef8f2865906b19&r=614f1a76b56a081048626e3acaa5c87bcd313fef
under etc/memory_layouts/windows/v0.34.11_graphics.ini
2013-05-08 15:39:32 -04:00
9e85aa4280
Ignore Mac OS X .DS_Store files
2013-05-06 23:59:49 -04:00
f415256650
Better way to check for the contained_items field.
2013-05-05 16:48:12 -06:00
e5fd918b0c
job: unk2 -> subtype
2013-05-05 03:55:08 +02:00
c496b9f76a
Translate make-dt.pl from df-structures into lua to avoid lisp dependency.
2013-05-01 14:43:00 +04:00
dd739313b1
ruby: tweak item_isfree
2013-04-30 18:38:52 +02:00
578b178ac0
scripts/startdwarf
2013-04-30 18:38:51 +02:00
f3e357d161
Fix detection of GET_MATERIAL_FROM_REAGENT results in workflow.
...
Dereference pointer to strings. Also just return undefined
material instead of skipping the product if it still fails.
2013-04-30 19:42:51 +04:00
ab4a38415a
Building base material undump script.
...
Based on an idea in https://github.com/peterix/dfhack/issues/119
2013-04-24 11:22:19 -06:00
18a91ef221
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
plugins/stonesense
2013-04-24 18:00:40 +02:00
d7145d9b69
Fix bug #188 , eggy hook
2013-04-24 17:50:34 +02:00
c39f4bc182
Fix build bug in automaterial.
2013-04-24 17:49:18 +02:00
6a907e3584
Fix issue #195 - off by one error in building dimensions
2013-04-24 17:41:25 +02:00
f5ef1464d8
Merge https://github.com/warmist/dfhack
2013-04-24 17:38:47 +02:00
222c61ab25
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-24 17:36:22 +02:00
3d7671507a
Tweak NEWS - add autobutcher script
2013-04-24 17:26:43 +02:00
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
df6355a092
Merge https://github.com/jjyg/dfhack
2013-04-24 16:24:14 +02:00
0efbc74ac2
Merge https://github.com/quietust/dfhack
...
Conflicts:
NEWS
2013-04-24 16:21:59 +02:00
3d6cbd9256
Add restrictice/liquid to readme and NEWS
2013-04-24 16:20:10 +02:00
aad5296f91
Merge branch 'master' of https://github.com/rampaging-poet/dfhack
2013-04-24 16:14:30 +02:00
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
94ceb752d8
Merge branch 'master' of https://github.com/NickHu/dfhack
2013-04-24 16:11:48 +02:00
300b24b401
Add example keybindings
2013-04-24 23:47:37 +12:00
ce47033190
fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.
2013-04-24 23:37:05 +12:00
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
80de3c05fa
Stocks plugin: Add keywords to search for flags.
2013-04-24 23:31:37 +12:00
eb8b2faf66
Stocks plugin: fix inventory check, add trade assignments, better hotkets.
2013-04-23 22:15:25 +12:00
c9776f481c
ruby: add construction/siegeengine bld subtypes in building_alloc
2013-04-21 22:29:51 +02:00
ba4f649b3c
scripts: switch to windows lineendings
2013-04-21 14:21:53 +02:00
expwnent
Alexander Gavrilov
Tareq A Khandaker
Eric Wald
jj
Eric Wald
Petr Mrázek
Anuradha Dissanayake
Robert Heinrich