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

5069 Commits (59e6607d8cd8d2f9c5fb77098d54492236371720)
 

Author SHA1 Message Date
Alexander Gavrilov 9cb913b121 Update structures 2014-06-26 17:24:11 +04:00
Alexander Gavrilov 92c4514286 Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop 2014-06-26 17:22:56 +04:00
Alexander Gavrilov d99c59e752 Merge remote-tracking branch 'jjyg/osx-binpatch' into develop 2014-06-26 17:22:52 +04:00
Alexander Gavrilov 82a5cd04d0 Merge remote-tracking branch 'q-github/develop' into develop 2014-06-26 17:07:34 +04:00
expwnent f557ec3358 Merge remote-tracking branch 'origin/develop' 2014-06-26 08:38:22 -04:00
expwnent 596ab0e1b8 Added many forum scripts, and a makeshift onReport/onStrike event that will be merged into eventful/EventManager later. 2014-06-26 08:36:57 -04:00
jj ce58d82733 add binpatch for hospital overstock on OSX 2014-06-25 23:16:54 +02:00
JapaMala 4f9479cce5 Fixed a bug where remotefortressreader was using min_x for min_z. 2014-06-25 18:49:00 +05:30
lethosor 3c8ba091f2 Disable "stable position" when site finder is active 2014-06-24 10:08:50 -04:00
Quietust 9625d56384 Update Manipulator to respect entity permitted_labor settings 
This has the effect of locking out the Alchemy labor, which is how it's
supposed to work in-game (but doesn't due to bug #6511)
 2014-06-24 08:36:36 -05:00
expwnent 7313c18a2a EventManager/eventful: added ON_REPORT event and exposed it to Lua. 2014-06-23 09:15:46 -04:00
expwnent 9afc861a2a syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly. 2014-06-23 09:14:56 -04:00
expwnent d7e3352b8c Remove exit line from package-release.bat so that you can see console output after calling it. 2014-06-21 17:45:19 -04:00
expwnent 14697174fc Merge remote-tracking branch 'dfhack/develop' into develop 2014-06-21 17:34:28 -04:00
expwnent 247bd212f3 Update stonesense. 2014-06-21 13:28:59 -04:00
JapaMala 3f717af0b7 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 
Conflicts:
	library/xml
 2014-06-21 16:43:44 +05:30
expwnent 634dd0aa1e Update NEWS. 2014-06-20 19:52:12 -04:00
expwnent f94fc5846d outsideOnly: allow checking periodically in case a building was made outside and then became inside. 2014-06-20 19:48:56 -04:00
expwnent c0e6e62cea outsideOnly: registration of buildings is now required, and you can also register buildings as inside-only. 2014-06-20 18:49:11 -04:00
expwnent f5de76e2cc Merge pull request #265 from DFHack/develop 
Merge 0.34.11-r5 into master
 2014-06-20 13:18:35 -04:00
expwnent 9695f4c65a Merge pull request #264 from expwnent/master 
DFHack 0.34.11-r5

(merging my own pull request is a little silly)
 2014-06-20 13:16:11 -04:00
expwnent b031229de7 Merge branch '0.34.11-r5' 2014-06-20 03:47:41 -04:00
expwnent 46e452848a Update NEWS. 2014-06-20 03:09:43 -04:00
expwnent f68279f87d Bump version to r5, update documents, include more documentation. 2014-06-20 02:48:12 -04:00
expwnent f1637d3a04 Removed my email from Contributors.rst. 2014-06-19 23:27:38 -04:00
expwnent 1994603177 Reorganized NEWS. 2014-06-19 23:22:51 -04:00
expwnent 036aae060b Merge lethosor stuff. For some reason, git's auto merge message didn't happen because of git-stash shenanigans. Oh well. 2014-06-19 22:58:17 -04:00
expwnent f72b52c5c0 Merge remote-tracking branch 'lethosor/filesystem-module-pr' into 0.34.11-r5 2014-06-19 22:36:40 -04:00
Lethosor ec64a787c6 Use _getcwd on Windows 2014-06-19 22:34:40 -04:00
expwnent 12d18ca64d Fix compile issues on windows. 2014-06-19 22:32:02 -04:00
Lethosor 73fdb8b125 Fix Windows compile-time error 2014-06-19 21:24:16 -04:00
expwnent 3357718d03 Merge remote-tracking branch 'origin/develop' into 0.34.11-r5 
Conflicts:
	Readme.rst
	plugins/CMakeLists.txt
 2014-06-19 19:59:20 -04:00
expwnent fc9b200ca4 Merge remote-tracking branch 'lethosor/cmdprompt-lineedit' into 0.34.11-r5 2014-06-19 18:26:17 -04:00
expwnent ec8f43f777 Merge remote-tracking branch 'lethosor/patch-3' into 0.34.11-r5 2014-06-19 17:49:33 -04:00
expwnent 7ec1d58147 Merge remote-tracking branch 'lethosor/filesystem-module-pr' 2014-06-19 17:29:41 -04:00
expwnent 1500729c6f Merge remote-tracking branch 'lethosor/patch-3' 2014-06-19 12:39:27 -04:00
lethosor d599fa414f Update NEWS 2014-06-18 15:47:17 -04:00
lethosor ef69522d93 Merge branch 'develop' into filesystem-module-pr 2014-06-18 15:45:42 -04:00
lethosor cca605d8b4 Prevent blank lines from being stored in history 2014-06-17 17:21:30 -04:00
lethosor 0c144b821d Reimplement command-prompt history 
Also add shift-left/right for back/forward one word
 2014-06-17 17:11:45 -04:00
lethosor 1684eced8a Remove (broken) command history 
This reverts commit cc07a373f3.
 2014-06-17 12:45:57 -04:00
lethosor 6f74d60521 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:33:04 -04:00
lethosor b8e7c8a946 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:28:46 -04:00
JapaMala ce849312c7 remotefortressreader now can send over sets of MapBlocks 2014-06-17 21:47:16 +05:30
Alexander Gavrilov 9580aa601e Rebuild Readme.html. 2014-06-17 10:49:32 +04:00
Alexander Gavrilov 2db73a407d Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop 2014-06-17 10:39:26 +04:00
Alexander Gavrilov 436754d845 Erase remnants of the window frame and recompress screenshots with pngout. 2014-06-17 10:39:03 +04:00
Alexander Gavrilov 32d8efad54 Merge branch 'lua-runcommand' of git://github.com/lethosor/dfhack into develop 2014-06-17 10:27:50 +04:00
lethosor fb922fab37 Handle invalid arguments to runCommand 2014-06-16 11:40:26 -04:00
lethosor d538e13450 Allow runCommand arguments to be passed as a table internally 2014-06-16 11:16:35 -04:00