Commit Graph

4869 Commits (c635632ae70263dba3f58c0ec8d2f7fefd806686)
 

Author SHA1 Message Date
expwnent c635632ae7 EventManager.cpp: fix indentation. 2014-06-27 22:09:01 -04:00
expwnent 2443568998 Merge branch 'develop' into scriptOrganization 2014-06-27 22:03:09 -04:00
expwnent ecd75e9b3e Allowed dfhack.timeout tick events to be queued before a world is loaded. 2014-06-27 06:49:29 -04:00
expwnent 2827861edf Fixed minor error in growthbug. 2014-06-27 06:09:01 -04:00
expwnent 352e72b992 Update NEWS. 2014-06-27 06:06:02 -04:00
expwnent 0db0244d08 Added add-syndrome script to modtools and fixed syndromeUtil so it actually works. This should make it so that event hooks only have to be able to run scripts instead of run scripts and add syndromes. 2014-06-27 05:47:52 -04:00
expwnent c7d7f37c12 Updated dfhack.init-example for script reorganization. 2014-06-27 03:52:36 -04:00
expwnent 0f5bbd5631 Reorganized scripts folder. Deleted digmat.rb because it's redundant with digSmart and it has a higher FPS impact. 2014-06-27 03:46:22 -04:00
expwnent 187ce3c58b Fixed the organization of my new lua modules. They now go in library/lua instead of where plugin lua modules go. Updated scripts accordingly. 2014-06-27 02:43:05 -04:00
expwnent 61d73cc6c2 Prevented infinite loop on incorrect syntax in repeat script. 2014-06-27 01:46:00 -04:00
expwnent 66098c2bb4 Fixed wrong documentation on repeating scripts. 2014-06-27 01:40:36 -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
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
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
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