d120e5aa84
Merge pull request #386 from ace13/develop
...
Missing includes.
2014-11-14 18:59:53 -05:00
a474bc4dea
Merge remote-tracking branch 'dfhack/develop' into develop
...
Conflicts:
NEWS
2014-11-14 18:58:21 -05:00
f9985ade7b
Update NEWS.
2014-11-14 18:57:09 -05:00
c40c4460ba
Merge remote-tracking branch 'putnam/fullhealfix' into develop
...
Conflicts:
NEWS
2014-11-14 18:56:21 -05:00
428fe6a400
interaction-trigger tweaks
2014-11-14 18:50:19 -05:00
e2f4d3e4cb
Fix persist-table so that all data is persistently stored properly.
2014-11-14 18:49:40 -05:00
38c4edf858
Merge pull request #388 from Putnam3145/add-thought
...
Add "add-thought" script to main repo
2014-11-14 16:05:38 -05:00
0642333f97
Merge pull request #343 from PeridexisErrant/exportlegends-sites
...
exportlegends can do site maps, IDd field
2014-11-14 16:05:06 -05:00
9f6a04db7f
Switched subthought and severity in function arg
2014-11-12 13:55:38 -08:00
4ccd4a96be
Updated add-thought to allow subthoughts.
...
Only works in non-gui mode for now, since there's no easy way to tell people what subthought is which with the GUI.
2014-11-12 13:54:44 -08:00
ce09e1a70f
Update NEWS.
2014-11-10 01:46:23 -08:00
f980ecf38d
Added add-thought to scripts.
...
I figure that it's useful enough and good enough by this point to be
included.
2014-11-10 01:44:30 -08:00
3a403d8ec6
Updated full-heal to properly use args system.
...
Also updated NEWS.
2014-11-10 01:09:15 -08:00
828852c36f
Made persist-table correctly clear its stuff after exiting a game.
2014-11-10 01:09:50 -05:00
593424cd6d
new Lua library for persistent maps of arbitrary degree.
2014-11-10 01:03:20 -05:00
6220a21de6
More straggling documentation errors in modtools.
2014-11-09 18:39:23 -05:00
55348e9c80
Correct reaction-trigger documentation.
2014-11-09 18:37:39 -05:00
838bbd97f6
New devel scripts for testing interaction-trigger.
2014-11-09 18:37:11 -05:00
779ac3fd50
Updated interaction-trigger to work better.
2014-11-09 18:36:21 -05:00
d2039386b0
Add <algorithm> includes and use min/max to get them into global scope
2014-11-09 11:20:09 +01:00
be1d411b83
Add missing <functional> include for std::greater
2014-11-09 11:19:51 +01:00
804aa8d398
Add missing <algorithm> include for std::min & std::max
2014-11-09 11:19:40 +01:00
3f82230685
Update NEWS.
2014-11-09 01:46:31 -05:00
0f5efb47ae
Update to 0.40.15.
2014-11-09 01:30:43 -05:00
1b0a2ecb8a
Merge remote-tracking branch 'eswald/tradescreen' into develop
...
Conflicts:
NEWS
2014-11-09 00:42:50 -05:00
7549169cd2
Merge remote-tracking branch 'dfhack/develop' into develop
2014-11-09 00:39:40 -05:00
c9cf94128e
Merge pull request #376 from lethosor/mousequery-z-level-fix
...
Fix selection behavior of mousequery on lowest z-level
2014-11-09 00:37:46 -05:00
f6a281ebc7
Merge pull request #379 from Putnam3145/teleport-update
...
Updated teleport for new args system.
2014-11-09 00:35:33 -05:00
6167f37e13
Merge pull request #380 from lethosor/update-export-dt-ini
...
Update export-dt-ini.lua
2014-11-09 00:35:04 -05:00
267d0837ad
Merge pull request #381 from lethosor/update-cmakelists
...
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
7929d44030
Merge pull request #382 from PeridexisErrant/autolabor-fixes
...
Autolabor fixes
2014-11-09 00:33:46 -05:00
8e492b1669
Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
...
Make dwarfmonitor compile for 0.40.14+
2014-11-09 00:33:14 -05:00
c154404a89
Merge pull request #385 from lethosor/automaterial-cursor
...
Fix automaterial/box-select cursor color
2014-11-09 00:32:32 -05:00
f069676fc2
Fix automaterial/box-select cursor color
...
Only use a dark green cursor when actually building a construction
2014-11-08 19:05:45 -05:00
994e98c5c1
Use name of now-identified field
...
Ready for DFHack 40.15-r1 and later
2014-11-09 09:18:53 +11:00
2484f89542
Update dwarfmonitor's happiness display
2014-11-08 15:08:56 -05:00
04ceb64bad
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
...
Conflicts:
NEWS
2014-11-08 14:36:20 -05:00
195ccf4bc8
Fix beekeeping, enable help message
...
Plugins should now be enabled with "enable autolabor". The beekeeping
bug was fixed in DF0.40.07, so autolabor can set multiple beekeepers
again.
2014-11-08 11:45:20 +11:00
9b94f56f7d
Expanded autolabor documentation
...
Because "see help function" isn't actually documentation. Information
pulled from help function and explanations in code.
2014-11-08 11:43:48 +11:00
ec580cdfa5
Re-enable rendermax in CMakeLists.txt
2014-11-07 16:43:50 -05:00
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
174e85dd16
Update NEWS
2014-11-07 15:39:24 -05:00
fa401f8637
EventManager tweak.
2014-11-07 14:16:10 -05:00
82dade1ae0
interaction-trigger documentation tweak.
2014-11-07 14:14:49 -05:00
6b2b13b186
Updated teleport for new args system.
...
Also updated the teleport function to properly check for units at
destination.
2014-11-06 22:15:21 -08:00
8ac9748700
Switching fast-trade Shift-Up to move before marking
...
This makes it undo Shift-Down, instead of mirroring it, which works much better when you've gone too far down the list.
2014-11-06 23:06:17 -07:00
308e95defe
Documenting autotrade
...
It's similar enough to automelt to share a section, right?
2014-11-06 22:41:16 -07:00
ea5fff7903
NEWS reports for trade screen issues
2014-11-06 22:28:13 -07:00
46ebeaa722
Adding Shift-Up to the fast-trade tweak.
2014-11-06 22:22:02 -07:00
7fb82131c7
Switching fast-trade from Shift-Enter to Shift-Down
...
Technically, from SELECT_ALL to CURSOR_DOWN_FAST, to avoid blocking the new native Select All functionality.
As a bonus, the new key repeats as you hold it down.
2014-11-06 22:14:00 -07:00
expwnent
expwnent
Putnam3145
Alexander "Ace" Olofsson
lethosor
PeridexisErrant
Lethosor
Eric Wald