Commit Graph

4931 Commits (e65a99f2522daa09b175e1211e6129d63cb6cea6)
 

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
lethosor 830b39e13b Non-silent version of Lua's run_command 2014-06-27 21:58:36 -04:00
expwnent 5539982ef6 Merge remote-tracking branch 'origin/scriptOrganization' into scriptOrganization 2014-06-27 06:50:59 -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 9a8b1d04fa Added functionality to repeat.lua so that you can make the thing that's repeating not happen right away. 2014-06-27 06:23:04 -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
Alexander Gavrilov 17ed08cfe5 Fix the OSX image base address so that binary patches work correctly. 2014-06-26 18:28:50 +04:00
Alexander Gavrilov 6f162a4e72 Verify that mkmodule is called with the correct module name. 2014-06-26 18:11:05 +04:00
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
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
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