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

5280 Commits (f6a281ebc748a0deb9128332ecc9f49d79e7b864)
 

Author SHA1 Message Date
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
lethosor 2484f89542 Update dwarfmonitor's happiness display 2014-11-08 15:08:56 -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
Putnam3145 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
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