Commit Graph

4782 Commits (5999dc63daf86a54cd282e3766bf62e52175f4f7)
 

Author SHA1 Message Date
lethosor 5999dc63da Use setupdwarfgame field names 2014-06-10 17:30:02 -04:00
lethosor f534c91fb8 Fix screen handling 2014-06-10 12:48:46 -04:00
lethosor 69c9353196 Merge branch 'develop' into tweak-confirm-embark 2014-06-10 12:43:03 -04:00
Alexander Gavrilov da6219e5a1 Mention a couple of features in NEWS 2014-06-10 13:32:15 +04:00
Alexander Gavrilov 8d6e6f6158 Merge remote-tracking branch 'warmist/mod-manager' into develop 2014-06-10 13:27:54 +04:00
Alexander Gavrilov 08b4279c4d Document better how to access fields of the interposed class. 2014-06-10 13:10:10 +04:00
Alexander Gavrilov 0be30b807c Merge branch 'console-move-word' of git://github.com/lethosor/dfhack into develop 2014-06-10 12:53:43 +04:00
Alexander Gavrilov 0e3fb79f0e Update structures 2014-06-10 12:52:17 +04:00
Quietust a1f9b1d1c4 Sync with structures change 2014-06-06 14:24:57 -05:00
Lethosor c29d61dca2 Use INTERPOSE_NEXT in key_conflict
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
lethosor 0a1d87c09f confirm-embark: Make esc work again 2014-06-04 23:18:19 -04:00
lethosor f29d1886ff tweak confirm-embark fixes
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
lethosor 6ec0fd6589 New tweak: confirm-embark
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
Quietust 23acf276b4 Silence warning C4800 on Windows 2014-06-03 08:58:31 -05:00
Quietust 7de0b2dd39 Merge pull request #255 from quietust/develop
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
Anuradha Dissanayake df244aa7a4 Disable mouse query when linking levers.
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
Anuradha Dissanayake 4034df3560 Fix incorrect plugin name in version check 2014-06-03 12:59:55 +04:00
Alexander Gavrilov 0a0358a8c1 Update structures 2014-06-03 12:59:55 +04:00
Alexander Gavrilov 63254df6dd Fix obvious issues in stockflow.
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
Alexander Gavrilov e7292379f7 Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop 2014-06-03 12:13:56 +04:00
Alexander Gavrilov 4831fb8a8c Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop 2014-06-03 12:11:31 +04:00
Alexander Gavrilov 89269f76fd Merge remote-tracking branch 'warmist/cmd-prompt' into develop 2014-06-03 12:10:06 +04:00
Alexander Gavrilov 06304c5a60 Merge branch 'dev-plugins' of git://github.com/lethosor/dfhack into develop 2014-06-03 12:06:58 +04:00
Warmist 49bbd41bc3 Added a way to change the mod install directory (and changed the default to hack/mods) and added simpler way to add to init.lua 2014-06-02 17:57:59 +03:00
Warmist 99659e7e00 cmd-prompt needs to work on ANY screen. This fixes it. 2014-05-26 18:42:42 +03:00
lethosor bdca1ee709 Linux: Extended back/forward word sequences 2014-05-26 10:03:28 -04:00
lethosor b14ef95dec Merge branch 'console-move-word' into console-move-word-linux 2014-05-26 10:01:04 -04:00
lethosor d320fe71d1 Implement extended arrow key sequences 2014-05-25 23:39:34 -04:00
lethosor 58b9c02ce5 Migrate esc-b/f sequences to Linux 2014-05-25 22:10:40 -04:00
lethosor 1fcaac9d2e OS X Console: Implement back/forward one word escape sequences 2014-05-25 21:52:16 -04:00
Quietust e483e7439f Fix problems with NONE for item types and subtypes 2014-05-22 08:18:01 -05:00
Ben Lubar d1aee89491 remove space before hyphen 2014-05-18 13:01:07 -05:00
Ben Lubar 76ec3ba58c Fix English names containing the word "the"
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
Lethosor d9dc7f31c2 Fix typo 2014-05-17 13:48:48 -04:00
lethosor f852802270 Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins 2014-05-16 21:23:34 -04:00
lethosor 293a535aa4 Fix crash with mouse input in search plugin 2014-05-16 20:53:36 -04:00
lethosor 9b1d393c1c Append newline to each section of output 2014-05-15 17:30:42 -04:00
lethosor 2074f7e78b Fix handling of newline characters in command-prompt output 2014-05-15 15:51:03 -04:00
lethosor d52a07ef76 Dismiss previous command prompt before creating a new one 2014-05-14 18:56:30 -04:00
lethosor a516811bb1 Only allow 3dveins to be run in fortress mode
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
Alexander Gavrilov e4a6f13347 Merge branch 'cleanup-needs-porting' into develop 2014-05-12 21:56:23 +04:00
Alexander Gavrilov ac4ff76727 Add to NEWS 2014-05-12 21:55:49 +04:00
Alexander Gavrilov a6d576961d Merge branch 'add-exportlegends-and-logregion' into develop 2014-05-12 21:51:03 +04:00
Alexander Gavrilov 81775d83eb Add to NEWS 2014-05-12 21:50:32 +04:00
Alexander Gavrilov afdfd00aa3 Merge branch 'segfault-reset-osx' of git://github.com/lethosor/dfhack into develop 2014-05-12 21:45:56 +04:00
Alexander Gavrilov 56903b9374 Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop 2014-05-12 21:44:31 +04:00
PeridexisErrant 01d302efc3 fixed whitespace again to four-space indentations
should have read the documentation before trying a style fix...
2014-05-12 10:34:57 +10:00
PeridexisErrant 8a488ec914 actually fixed whitespace
to four-space indentations.  I should have read the documentation
earlier...
2014-05-12 10:32:46 +10:00
PeridexisErrant a2f5e971e2 fixed whitespace in dfstatus script
all indents now use a uniform eight spaces; fixed from mix of four
spaces and tabs
2014-05-12 10:29:59 +10:00
PeridexisErrant 795325b6ef replace all tabs with eight spaces
apparently an important style thing, which I missed
2014-05-12 10:22:04 +10:00