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

10278 Commits (392648204783927325a0824281587e8e63ff98c7)
 

Author SHA1 Message Date
expwnent afd7b9cf0b Merge pull request #398 from Putnam3145/patch-5 
Update add-thought.lua
 2014-11-19 09:35:57 -05:00
expwnent 330388b803 Merge pull request #399 from lethosor/fix-farm-plot-select-crash 
Prevent farm-plot-select from selecting crops when no crops are listed
 2014-11-19 09:35:34 -05:00
lethosor 4922c36ada Prevent farm-plot-select from selecting crops when no crops are listed 
Fixes #396
 2014-11-18 19:57:29 -05:00
Putnam3145 ae6675a188 Update add-thought.lua 2014-11-17 22:47:33 -08:00
expwnent d83c32a0c5 Merge pull request #397 from lethosor/fatal-error-stdout 
Print fatal errors to stdout on Linux/OS X
 2014-11-18 00:24:24 -05:00
lethosor a003ce7394 Print fatal errors to stdout on Linux/OS X 2014-11-17 15:12:33 -05:00
expwnent 97b44d5898 persist-table tweaks, delete debug print messages 2014-11-16 20:41:11 -05:00
expwnent f2e594ddfb Merge remote-tracking branch 'jjyg/develop' into develop 2014-11-16 17:07:36 -05:00
expwnent 7560fbdb6b library/lua/persist-table.lua: now it uses metatables to make persistent memory storage even easier. 2014-11-16 17:06:59 -05:00
Yoann Guillot c43685ae76 superdwarf: remove ruby global function 2014-11-16 13:06:14 +01:00
Yoann Guillot 889bd06ffc ruby: fix windows platform detection 2014-11-16 13:00:38 +01:00
lethosor 9fd6e9f03c Expand dwarfmonitor weather indicator 2014-11-15 17:29:19 -05:00
expwnent 1aeb4e5769 Merge remote-tracking branch 'lethosor/update-falconne-plugins' into develop 2014-11-15 16:50:09 -05:00
lethosor fc758fdbe4 NEWS: Consistent spacing 2014-11-15 16:48:06 -05:00
lethosor fa79f297a3 Update NEWS 2014-11-15 16:46:46 -05:00
lethosor bc73319333 Make rain indicator LIGHTBLUE for better visibility 2014-11-15 16:39:19 -05:00
lethosor 9b0d0eba45 Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins 2014-11-15 16:36:35 -05:00
lethosor 4513fa4ab2 Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins 2014-11-15 16:34:59 -05:00
lethosor 61fa2fbda0 Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins 
Conflicts:
	NEWS
	plugins/CMakeLists.txt
	plugins/automelt.cpp
 2014-11-15 16:31:51 -05:00
expwnent 798bec3ced Merge branch 'delvintemp' into develop 2014-11-15 16:28:52 -05:00
lethosor f7fcb342ed Fix buildingplan compiling with GCC 2014-11-15 16:21:47 -05:00
lethosor 578ac08999 Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins 2014-11-15 16:18:00 -05:00
lethosor 3c1e07252b Update autotrade stockpile controls 2014-11-15 16:16:32 -05:00
expwnent 2edc3594b8 Make it compile. 2014-11-15 16:03:36 -05:00
lethosor 842bd3581d Merge remote-tracking branch 'falconne/plugin_mousequery' into update-falconne-plugins 2014-11-15 15:58:41 -05:00
lethosor d62305b69e Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins 
Conflicts:
	plugins/autotrade.cpp
 2014-11-15 15:56:44 -05:00
lethosor d18ed6df5e Merge remote-tracking branch 'falconne/plugin_hotkeys' into update-falconne-plugins 
Conflicts:
	plugins/CMakeLists.txt
 2014-11-15 15:45:51 -05:00
expwnent 723d6af9f8 Merge https://github.com/Mchl/dfhack into develop. Manually remove trailing whitespace, update NEWS. 
Conflicts:
	scripts/forum-dwarves.lua
 2014-11-15 15:33:48 -05:00
expwnent 15194613f5 Manually add hobotron's superdwarf fix. 2014-11-15 15:23:00 -05:00
expwnent 3021fa47db Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop 
Conflicts:
	NEWS
 2014-11-15 15:07:20 -05:00
Putnam3145 2cc59b44ec Update Contributors.rst 2014-11-15 00:06:59 -08:00
expwnent 23b76d4672 Update NEWS. 2014-11-15 00:24:02 -05:00
expwnent a04ea52e19 Added Putnam's gaydar script. 2014-11-15 00:22:58 -05:00
expwnent ba8b964f8d reaction-trigger-transition.lua should work now. 2014-11-15 00:06:10 -05:00
expwnent 59ef4e0cc2 It is now possible to remove syndromes by SYN_CLASS. 2014-11-14 23:33:49 -05:00
expwnent 5e3bf9a494 Make it compile for OSX. 2014-11-14 22:21:03 -05:00
expwnent 4464d7318d EventManager: make REPORT events only trigger for new reports, not ones that already exist in the save. 2014-11-14 22:07:48 -05:00
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