Commit Graph

2065 Commits (8495bddc2d6a9693ab2f8d21a0a1000041ba3686)

Author SHA1 Message Date
lethosor b11673e9b0 Use this instead of getCurViewscreen 2014-06-10 12:38:40 -04:00
lethosor 088eff05e5 Merge branch 'develop' into dev-embarktools-pr 2014-06-10 12:08:43 -04:00
Pierre-David Bélanger 044f958551 Squad column and squad info in Dwarf Manipulator (manipulator plugin) 2014-06-09 21:58:16 -04:00
lethosor cc07a373f3 Command-prompt history
Creates duplicate entries occasionally

Also disabled movies
2014-06-09 19:38:21 -04:00
lethosor aafcd6c43a Fix 4/6 behavior 2014-06-09 17:00:26 -04:00
lethosor 055afafedc command-prompt: Basic line editing
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -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
lethosor a7fd6c4783 Add embark-tools settings interface 2014-06-03 15:03:03 -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 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
Warmist 99659e7e00 cmd-prompt needs to work on ANY screen. This fixes it. 2014-05-26 18:42:42 +03:00
Quietust e483e7439f Fix problems with NONE for item types and subtypes 2014-05-22 08:18:01 -05:00
lethosor 2d778be956 Fix embark sidebar updating 2014-05-20 15:51:26 -04:00
lethosor fcb62ac7dd sticky: Fix handling of rapid input 2014-05-19 17:43:30 -04:00
lethosor da31bab419 Display embark label on all 5 map pages 2014-05-19 16:33:17 -04:00
lethosor bb5f7b475d Add sticky (equivalent of tweak stable-cursor) 2014-05-19 16:11:42 -04:00
lethosor 02811c773c Fix crash with child screens (e.g. saving a macro) 2014-05-19 15:53:29 -04:00
lethosor 96b70a93bc Update readme 2014-05-18 21:21:17 -04:00
lethosor 6519ac1bf8 Add sand indicator and allow enabling/disabling all tools 2014-05-18 20:03:59 -04:00
lethosor 0f5802af9f Add embark-tools
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04: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
expwnent 8cc4bea0d4 Added petcapRemover plugin. 2014-05-17 17:59:41 -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 56903b9374 Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop 2014-05-12 21:44:31 +04:00
lethosor b166f51568 Handle missing arguments to filter/paint in tiletypes 2014-05-11 14:17:56 -04:00
Alexander Gavrilov e829b2eea4 Fix missing newline and update Readme.html 2014-05-11 16:05:00 +04:00
Alexander Gavrilov ae8d630cfa Merge remote-tracking branch 'warmist/dev-rendermax' into develop 2014-05-11 15:44:29 +04:00
Warmist a088219b3e Fixed ALL the bugs: zooming does not crash and fullscreening also does not crash now. 2014-05-11 14:19:02 +03:00
Alexander Gavrilov a3d7b54b9c Merge remote-tracking branch 'falconne/develop' into develop 2014-05-11 13:22:13 +04:00
Alexander Gavrilov 8989c06900 Merge branch 'tweak_changes' into develop 2014-05-11 13:19:44 +04:00
Quietust 4b8f68dfa9 Add a few tweaks - fix wear on cloth/leather items, disable wear on adamantine clothes 2014-05-08 14:22:45 -05:00
Warmist b6b839c802 Fix for osx to build. 2014-05-06 21:59:11 +03:00
Warmist fef296110f Fixed friend class bug. 2014-05-06 07:17:02 +03:00
Anuradha Dissanayake f824e7f294 stocks plugin: added more filtering and display options. 2014-05-05 16:56:40 +12:00
Eric Wald 144eff4cf2 Clearing the center column.
The official order selection screen has an extra space to the left of the orders on the right-hand side.
2014-05-04 15:36:42 -06:00
Eric Wald 4fc850445d Magic Number Reduction: Display placement constants 2014-05-04 15:28:53 -06:00
Eric Wald 767badbfb9 Magic number reduction: Clothing flags
Bone and shell are used to construct BARRED and SCALED armor/clothing items, for some reason.
2014-05-04 15:13:25 -06:00
Eric Wald bdb22235af Magic number reduction: Job types 2014-05-04 15:02:12 -06:00
Eric Wald 2d5f7e4022 Magic number reduction: Persistent storage
Replaces explicit indices into the ints field of Stockflow persistent storage objects with enumerated values.
2014-05-04 12:55:00 -06:00
Eric Wald 723cfcf28e Attempting to repair an order object leak.
Now frees manager_order objects in the reaction_list when the plugin is disabled or the world unloaded.  However, there may still be orders leaked elsewhere.
2014-05-04 12:35:10 -06:00
Warmist e29e29d537 Updated readme, NEWS and changed where rendermax looks for it's config. 2014-05-04 21:00:16 +03:00
Alexander Gavrilov 13584f08c5 Merge remote-tracking branch 'warmist/dev-buildings' into develop 2014-05-04 19:52:01 +04:00
Anuradha Dissanayake 1f93b8e144 getplants: add autochop function to automate woodcutting. 2014-05-04 23:43:52 +12:00
Anuradha Dissanayake e9c7d502e2 dwarfmonitor: add screen to summarise preferences of fortress dwarfs. 2014-05-04 22:45:48 +12:00
Anuradha Dissanayake 5a3065fa80 Use shifted keys for buildingplan so as not to interfere with QuickFort. 2014-05-04 22:23:10 +12:00
Anuradha Dissanayake cba143c447 Add workshop profile search. 2014-05-04 22:04:03 +12:00
Anuradha Dissanayake 7fd7d3d48c mousequery: several usability improvements.
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
Anuradha Dissanayake de9140336f autotrade: adds "(Un)mark All" options to both panes of trade screen. 2014-05-03 22:56:34 +12:00
Anuradha Dissanayake 5e52bb60f0 Update uicommon.h with new common display functions 2014-05-03 21:19:46 +12:00
Anuradha Dissanayake a14f31fbfe Show box select dimensions in Automaterial 2014-05-03 11:44:35 +12:00
Alexander Gavrilov 415cdad489 Make using new for allocating DF objects with vtables a compile-time error.
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.

This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
Timothy Collett e4641c506f Replace a std::string method not implemented until C++11 with a C++0x-valid substitute 2014-04-21 09:34:42 +04:00
Eric Wald 5fb87c2ea9 Now accepts the new enable/disable commands. 2014-04-18 21:58:45 -06:00
Alexander Gavrilov 63d256c1e9 Adjust siege engine targeting weights.
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
Alexander Gavrilov c27c38e4c0 Remove tired or hungry siege operators from duty when at peace.
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
Alexander Gavrilov fc9826389b Account for meandering movement when predicting unit path in siege engine.
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov 55cea36c76 Use the new API to produce combat reports for aimed siege engine attacks.
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
Eric Wald 0a99bb0cae Now works when enabled is true by default. 2014-04-13 15:23:37 -06:00
Eric Wald b9ed7a5cc2 Stockflow plugin v1.0 2014-04-13 15:19:03 -06:00
Alexander Gavrilov 7aecffe0cd Update structures and fix broken things. 2014-04-04 22:34:39 +04:00
jj eac126c884 ruby: use placement-new instead of hack 2014-04-01 15:12:52 +02:00
Quietust 837da8ae98 Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types 2014-03-25 13:30:45 -05:00
Alexander Gavrilov 36b069e981 Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop 2014-03-24 20:10:58 +04:00
Alexander Gavrilov a01939fce6 Sync structures. 2014-03-24 19:45:27 +04:00
Alexander Gavrilov 827dd121d8 Make createitem default to the controlled unit in adventure mode. 2014-03-24 19:35:34 +04:00
Alexander Gavrilov 8963a49414 Forbid the items shot by siege engines if the forbid ammo order is set.
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
Warmist 4cbab2b014 Small fix that got lost in rebase 2014-03-07 20:28:07 +02:00
Warmist 50963c73fa rendermax: added adv mode lights also more proc-expensive diffuse mode. 2014-03-07 20:08:48 +02:00
Warmist b5b01ea02b rendermax: mainly organizing
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
Warmist 372f861010 rendermax: fixed crashes (hopefully for real this time) 2014-03-07 20:08:10 +02:00
Warmist 72259c8eba Added creature lights and item lights. 2014-03-07 20:08:08 +02:00
Warmist 830d9900fb Fixed a bug that enabled rendermax even when it was supposed to be off. 2014-03-07 20:08:08 +02:00
Warmist a3d3c34671 Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode) 2014-03-07 20:08:07 +02:00
Warmist c2db761a1b Rendermax: made it use unordered_map instead of map. 2014-03-07 20:07:21 +02:00
Warmist 5ad3a7570f Fixed a lot of disable lights bugs 2014-03-07 20:07:21 +02:00
Warmist f34a4ce34e Renamed lightCell to rgbf 2014-03-07 20:07:20 +02:00
Warmist ee1bad84fc Threading rewrite. 2014-03-07 20:07:20 +02:00
Japa b248eb3e52 Fixed broken buildings, also added floodgate functionality.
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
Warmist 0cf5eedc2a Fixed potential error with building getting transparent on un-powering. 2014-03-07 20:07:17 +02:00
Warmist 48f855c499 Added occlusionON|occlusionOFF commands 2014-03-07 20:06:50 +02:00
Warmist 360b5d2e18 Fix for gems not getting right color. 2014-03-07 20:06:50 +02:00
Warmist 28985167c9 Fixed bug with buildings and added gems to material definition. 2014-03-07 20:06:49 +02:00
Japa b12fd5a4c5 Changed sun calculation direction. 2014-03-07 20:06:46 +02:00
Warmist d8b0b82122 Added antialiased lights. They kind of suck. So I disabled them. 2014-03-07 20:06:46 +02:00