MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,341 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

9341 Commits (2762f75d69e51e8faf9febc515cc45e84999bdbd)
 

Author SHA1 Message Date
Eric Wald 26ab2165b3 Updating NEWS 2014-11-14 18:58:57 -07:00
Eric Wald c85d4994cf Preventing blank history files 2014-11-14 17:35:06 -07:00
expwnent c7e0a13505 Merge branch 'adaptation-4015' of https://github.com/hobotron-df/dfhack into develop 
Conflicts:
	NEWS
 2014-11-14 19:06:04 -05:00
expwnent d120e5aa84 Merge pull request #386 from ace13/develop 
Missing includes.
 2014-11-14 18:59:53 -05:00
expwnent a474bc4dea Merge remote-tracking branch 'dfhack/develop' into develop 
Conflicts:
	NEWS
 2014-11-14 18:58:21 -05:00
expwnent f9985ade7b Update NEWS. 2014-11-14 18:57:09 -05:00
expwnent c40c4460ba Merge remote-tracking branch 'putnam/fullhealfix' into develop 
Conflicts:
	NEWS
 2014-11-14 18:56:21 -05:00
expwnent 428fe6a400 interaction-trigger tweaks 2014-11-14 18:50:19 -05:00
expwnent e2f4d3e4cb Fix persist-table so that all data is persistently stored properly. 2014-11-14 18:49:40 -05:00
expwnent 38c4edf858 Merge pull request #388 from Putnam3145/add-thought 
Add "add-thought" script to main repo
 2014-11-14 16:05:38 -05:00
expwnent 0642333f97 Merge pull request #343 from PeridexisErrant/exportlegends-sites 
exportlegends can do site maps, IDd field
 2014-11-14 16:05:06 -05:00
Yoann Guillot 8042c5d342 ruby: load arch-specific ruby-autogen 2014-11-14 12:49:08 +01:00
Yoann Guillot 696380e749 ruby: distinguish ruby-autogen.rb name based on architecture 2014-11-14 12:47:42 +01:00
Yoann Guillot e2229f6a6a ruby: remove DL_RUBY cmake option 2014-11-14 12:38:24 +01:00
hobotron-df a6b7d6beeb New script for viewing or setting cavern adapation of citizens. 2014-11-13 12:13:23 -06:00
Putnam3145 9f6a04db7f Switched subthought and severity in function arg 2014-11-12 13:55:38 -08:00
Putnam3145 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
Putnam3145 ce09e1a70f Update NEWS. 2014-11-10 01:46:23 -08:00
Putnam3145 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
Putnam3145 3a403d8ec6 Updated full-heal to properly use args system. 
Also updated NEWS.
 2014-11-10 01:09:15 -08:00
expwnent 828852c36f Made persist-table correctly clear its stuff after exiting a game. 2014-11-10 01:09:50 -05:00
expwnent 593424cd6d new Lua library for persistent maps of arbitrary degree. 2014-11-10 01:03:20 -05:00
expwnent 6220a21de6 More straggling documentation errors in modtools. 2014-11-09 18:39:23 -05:00
expwnent 55348e9c80 Correct reaction-trigger documentation. 2014-11-09 18:37:39 -05:00
expwnent 838bbd97f6 New devel scripts for testing interaction-trigger. 2014-11-09 18:37:11 -05:00
expwnent 779ac3fd50 Updated interaction-trigger to work better. 2014-11-09 18:36:21 -05:00
Alexander "Ace" Olofsson d2039386b0 Add <algorithm> includes and use min/max to get them into global scope 2014-11-09 11:20:09 +01:00
Alexander "Ace" Olofsson be1d411b83 Add missing <functional> include for std::greater 2014-11-09 11:19:51 +01:00
Alexander "Ace" Olofsson 804aa8d398 Add missing <algorithm> include for std::min & std::max 2014-11-09 11:19:40 +01:00
expwnent 3f82230685 Update NEWS. 2014-11-09 01:46:31 -05:00
expwnent 0f5efb47ae Update to 0.40.15. 2014-11-09 01:30:43 -05:00
expwnent 1b0a2ecb8a Merge remote-tracking branch 'eswald/tradescreen' into develop 
Conflicts:
	NEWS
 2014-11-09 00:42:50 -05:00
expwnent 7549169cd2 Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-09 00:39:40 -05:00
expwnent 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
expwnent f6a281ebc7 Merge pull request #379 from Putnam3145/teleport-update 
Updated teleport for new args system.
 2014-11-09 00:35:33 -05:00
expwnent 6167f37e13 Merge pull request #380 from lethosor/update-export-dt-ini 
Update export-dt-ini.lua
 2014-11-09 00:35:04 -05:00
expwnent 267d0837ad Merge pull request #381 from lethosor/update-cmakelists 
Re-enable rendermax in CMakeLists.txt
 2014-11-09 00:34:23 -05:00
expwnent 7929d44030 Merge pull request #382 from PeridexisErrant/autolabor-fixes 
Autolabor fixes
 2014-11-09 00:33:46 -05:00
expwnent 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
expwnent c154404a89 Merge pull request #385 from lethosor/automaterial-cursor 
Fix automaterial/box-select cursor color
 2014-11-09 00:32:32 -05:00
lethosor 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
PeridexisErrant 994e98c5c1 Use name of now-identified field 
Ready for DFHack 40.15-r1 and later
 2014-11-09 09:18:53 +11:00
lethosor 2484f89542 Update dwarfmonitor's happiness display 2014-11-08 15:08:56 -05:00
lethosor 04ceb64bad Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix 
Conflicts:
	NEWS
 2014-11-08 14:36:20 -05:00
PeridexisErrant 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
PeridexisErrant 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
Lethosor ec580cdfa5 Re-enable rendermax in CMakeLists.txt 2014-11-07 16:43:50 -05:00
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
Lethosor 174e85dd16 Update NEWS 2014-11-07 15:39:24 -05:00
expwnent fa401f8637 EventManager tweak. 2014-11-07 14:16:10 -05:00