Commit Graph

5268 Commits (ae001c60ad507fa98dbe01c6c0b97832e54f0513)
 

Author SHA1 Message Date
Lethosor ae001c60ad Update export-dt-ini.lua
From https://github.com/splintermind/Dwarf-Therapist/blob/DF2014/export-dt-ini.lua
2014-11-07 16:40:53 -05:00
expwnent ba56f369e5 Update NEWS. 2014-11-06 23:47:38 -05:00
expwnent e4d4f7230b modtools/item-trigger: fix equip/unequip bug and correct minor documentation error 2014-11-06 23:46:10 -05:00
expwnent dcdb6aae1b EventManager: properly deal with frame_counter getting reset. 2014-11-06 23:44:13 -05:00
expwnent 63c733d0b5 Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-05 21:31:50 -05:00
expwnent d35e422511 Update NEWS and CMakeLists for release. 2014-11-05 21:30:31 -05:00
expwnent e9e8b83656 Update stonesense. 2014-11-05 20:57:57 -05:00
expwnent 272aa5dc50 Merge pull request #374 from lethosor/0.40.14-update-news
Update NEWS
2014-11-02 13:30:43 -05:00
Lethosor f818dd3897 Update NEWS
This covers commits from 0.40.13-r1 to b81346
2014-11-02 12:39:01 -05:00
expwnent b81346fa21 Merge pull request #349 from lethosor/tweak-reorganization
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
lethosor 5232bffb53 farm-plot-select: Actually check for crop validity 2014-11-02 12:21:51 -05:00
expwnent 29d6bba669 Fix trackstop ambiguity complaints, update df-structures. 2014-11-02 11:55:01 -05:00
lethosor 14b947837c Merge remote-tracking branch 'origin/develop' into tweak-reorganization
Conflicts:
	NEWS
	Readme.html
	plugins/tweak/tweak.cpp
2014-11-02 11:40:53 -05:00
expwnent ad96ba74ea Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-02 04:14:48 -05:00
expwnent 21a7546556 Add stocks, autochop to dfhack.init-example enable (PeridexisErrant) 2014-11-02 04:09:46 -05:00
expwnent 84c7910628 Merge pull request #339 from PeridexisErrant/document-seedwatch
properly documented the seedwatch plugin
2014-11-02 04:08:12 -05:00
expwnent 4e0ad256a5 Update XML. 2014-11-02 04:06:51 -05:00
expwnent 87443035a9 Merge remote-tracking branch 'quietust/develop' into develop
Conflicts:
	plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
expwnent 4ccfb07a54 Merge pull request #350 from hobotron-df/fastdwarf-attack-speed
Fixes for fastdwarf combat speed and attack retargeting.
2014-11-02 03:37:55 -05:00
expwnent bfac2b97cc Merge pull request #352 from eswald/trackstop
New trackstop plugin
2014-11-02 03:34:22 -05:00
expwnent 82fb533176 Merge pull request #353 from eswald/autotrade-bugfix
Autotrade bugfix: Mark All now unmarks bin contents.
2014-11-02 03:33:28 -05:00
expwnent 4e38ec95b3 Merge pull request #354 from eswald/duplicate-onload
Removing duplicate world and map loading events.
2014-11-02 03:32:36 -05:00
expwnent 4b7c4f8c4b Merge pull request #356 from lethosor/disable-console
Allow console to be disabled by setting an environment variable
2014-11-02 03:31:35 -05:00
expwnent 6c356b5ae9 Merge pull request #359 from lethosor/embark-tools-oo-pr
embark-tools cleanup
2014-11-02 03:30:38 -05:00
expwnent 0fa2cab5ac Merge pull request #360 from eswald/automelt
Faster automelt
2014-11-02 03:29:01 -05:00
expwnent 6fa3f92f21 Merge pull request #361 from eswald/drainaquifer
Rewriting the drainaquifer script
2014-11-02 03:27:08 -05:00
expwnent 0fd15cc1e4 Merge pull request #365 from eswald/stable-sorting
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
expwnent 49939ccb9c Merge pull request #369 from warmist/fix-rendermax
Update rendermax
2014-11-02 03:25:04 -05:00
expwnent 5ad23d0ff9 Merge pull request #373 from lethosor/patch-7
Fix forum-dwarves.lua
2014-11-02 03:18:16 -05:00
Lethosor c60e06aed3 Fix forum-dwarves.lua
formatted_text -> src_text
2014-11-01 17:28:08 -04:00
Quietust bad923130c Manipulator - remove minimum width for Labors column, since it triggered the "should never happen" case upon extending the first column from 4 to 6 2014-11-01 11:24:05 -05:00
Quietust 7c92f4abaa Seems I misread the code from 0.34.11 - it switches against rand(2), not rand(3) 2014-10-31 13:47:04 -05:00
Quietust 8769af8935 Merge branch 'develop' of https://github.com/expwnent/dfhack into develop 2014-10-31 13:34:20 -05:00
Quietust f08a32f4e2 Update Manipulator to display stress level instead of happiness 2014-10-31 13:33:35 -05:00
Quietust ed225de365 Update strangemood to check stress level for fell/macabre moods 2014-10-31 13:33:18 -05:00
Quietust f683395cae Comment out more of military-training tweak, which no longer compiles 2014-10-31 13:33:04 -05:00
Quietust d05f249619 Merge branch 'develop' of github.com:DFHack/dfhack into develop 2014-10-31 13:32:49 -05:00
expwnent 72654e602a Merge pull request #355 from lethosor/patch-6
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
Alexander Gavrilov 04ec2c9932 Update version to v0.40.14 and hack things so they compile.
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
Alexander Gavrilov beebd624e7 Last xml update for v0.40.13 2014-10-26 13:20:45 +03:00
Eric Wald ac73c0eeba Allowing non-labor skills to sort stably. 2014-10-21 22:49:50 -06:00
Eric Wald 169da1342d Switching Dwarf Manipulator to a stable sort.
This means, for example, that when you sort by one skill, then by a second, dwarves with the first skill but not the second will still be grouped together.
2014-10-21 22:43:56 -06:00
Eric Wald 5d53163e16 Repairing drain-aquifer layer counting. 2014-10-12 22:28:23 -06:00
Eric Wald b0b1dd62d1 Rewriting the drainaquifer script
The original drainaquifer script could occasionally fail to notice aquifer layers if they happen to skip each of the special tiles that it checks, two per block.  It also left the block-level aquifer flags set, which seems like a minor waste of FPS.

The new script uses the block-level flags to determine which blocks to check, which seems to be both more correct and faster.  It's also written in Lua instead of Ruby, for clarity and ease of debugging.  The name has changed slightly to prevent problems if both scripts are installed for some reason.
2014-10-12 21:55:36 -06:00
lethosor f3626c1004 embark-tools cleanup
Fix #358: Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
Quietust cdcc0d228d Merge branch 'develop' of https://github.com/angavrilov/dfhack into develop 2014-10-08 11:30:06 -05:00
lethosor e41a33ddea Allow console to be disabled by setting an environment variable 2014-10-06 17:10:33 -04:00
Lethosor 0fd3f3dbf4 Update digFlood documentation to mention onLoad(World).init
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
Eric Wald 95dd009a15 Restoring automelt for items in bins.
The stockpile iterator yields bins, but not their contents.  Should other containers be checked, too?
2014-10-05 17:57:57 -06:00
expwnent 0471294b1e Fix syndrome-util. 2014-10-04 21:54:07 -04:00