Commit Graph

8727 Commits (ba54730ed062282ce1243b3311fa7b1fe4c7d37b)
 

Author SHA1 Message Date
lethosor ba54730ed0 Merge branch 'mousequery-edge-map-bounds' into develop 2019-05-18 14:24:14 -04:00
lethosor 92717a7f71 mousequery: Fix some more instances of map boundary checks 2019-05-16 23:30:03 -04:00
lethosor c3b06b81c7 mousequery: use map dimensions to determine edge scrolling locations
TWBT modifies the map dimensions, so using the window dimensions to handle edge
scrolling produces the wrong behavior when using a larger map tileset than text
tileset.
2019-05-16 23:22:11 -04:00
lethosor edb5e37246 Merge branch 'ninja-xml-byproducts' into develop 2019-05-16 23:14:18 -04:00
lethosor dd9c433f17 Use BYPRODUCTS to keep ninja builds from re-running codegen every time
This partially reverts f02466de8a, but behavior
should be the same under MSVC, which that commit attempted to fix. From
https://cmake.org/cmake/help/v3.14/command/add_custom_command.html:

> The `BYPRODUCTS` option is ignored on non-Ninja generators except to mark
> byproducts `GENERATED`.

Since `$GENERATED_HDRS` are already marked generated, this change should have
no effect on non-Ninja generators.
2019-05-13 19:47:39 -04:00
lethosor f2bd697d64 mousequery: give explicit feedback when enabling/disabling sub-features
The behavior of this plugin is somewhat unintuitive - "mousequery edge" disables
the edge-scrolling feature instead of enabling it. This should avoid confusion
without breaking compatibility with existing init scripts.
2019-05-13 19:21:57 -04:00
lethosor 32a0ab9679 Update submodules 2019-05-11 23:34:59 -04:00
lethosor 606fd43118 Merge branch 'develop' of gh:dfhack/dfhack into develop 2019-04-30 16:54:33 -04:00
lethosor e5eade1ad7 Make gui.dwarfmode.{get_movement_delta,get_hotkey_target} public 2019-04-30 16:53:09 -04:00
Alan a40adf1f86
Merge pull request #1435 from cppcooper/cxxrandom-rel
[Release] cxxrandom v2.0.1
2019-04-16 12:04:40 -04:00
Josh Cooper 9c403f509d [Release] cxxrandom v2.0.1 2019-04-15 16:21:54 -07:00
lethosor c11f2b5ffa Update stonesense (fix non-Linux builds) 2019-03-28 14:01:28 -04:00
lethosor 3a9fea9c52 Update stonesense 2019-03-28 11:09:46 -04:00
lethosor 6c266075de Console-posix: fix crash with prompts longer than screen width
Also add an extra fallback check around substr

Fixes #1425
2019-01-15 21:06:49 -05:00
lethosor 17d60c5a1f Mention custom profession folder and clean up docs a bit 2019-01-04 10:51:54 -05:00
Lethosor 22fc43c7af
Merge pull request #1419 from lethosor/travis-clear-df-folder
travis: Always clear DF folder
2019-01-02 19:51:18 -05:00
lethosor 703e1b8a0c Consolidate cd commands 2019-01-02 19:15:19 -05:00
lethosor 9663897037 Fix inconsistency resulting in nested df_linux folders 2019-01-02 18:40:34 -05:00
lethosor 13dfa130d7 Add more diagnostics to run-tests.py 2019-01-02 17:34:08 -05:00
lethosor 8063717503 get-df-version: make filter more strict 2019-01-02 17:05:28 -05:00
lethosor b08ccd001e travis: Always clear DF folder 2019-01-02 17:05:07 -05:00
lethosor af0d569afd check-rpc: add -> append 2018-12-29 00:15:45 -05:00
lethosor 315852a251 labormanager: fix -Wreorder warning 2018-12-27 19:46:36 -05:00
lethosor 9fe24e1b3f Update changelog and bump version to r2 2018-12-27 19:39:43 -05:00
lethosor f8dd215012 Update scripts and related changelog entries 2018-12-27 17:57:55 -05:00
lethosor e74946f62e Update xml and related changelog entries 2018-12-27 17:37:13 -05:00
lethosor 3e2c898e1a Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
Also move changelog entries to misc improvements per #1383
2018-12-27 16:52:30 -05:00
Lethosor 58fd98cb12
Merge pull request #1386 from billw2012/lm-disable-labor
labormanager: add option to disable the management of a labor.
2018-12-27 16:49:01 -05:00
lethosor 32edeffc3f Remove unused find_package(Threads) 2018-12-27 16:31:57 -05:00
lethosor 5554b0d89f Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
Missing update to Plugins.rst from web editor
2018-12-27 16:30:47 -05:00
lethosor a2f8742128 Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
Also fix and reorganize changelog
2018-12-27 16:28:25 -05:00
Lethosor 0ccfc8be35
Fix a few typos in docs and reorganize a bit 2018-12-27 16:21:24 -05:00
Lethosor 0209e76f19
Merge pull request #1385 from ab9rf/labormanager-cleaning
labormanager: assign more dwarves to cleaning
2018-12-23 23:14:53 -05:00
lethosor 13c6bfc1b2 Merge remote-tracking branch 'sgayda2/memory_fixes' into develop 2018-12-22 11:54:31 -05:00
lethosor dfbb2416d9 Update docs for nestboxes (#1395) 2018-12-20 21:29:48 -05:00
lethosor 92482d63f5 Merge remote-tracking branch 'ab9rf/nestboxes' into develop 2018-12-20 20:57:09 -05:00
PatrikLundell ef57295c02 Added coal search to embark-assistant 2018-12-04 14:58:10 +01:00
PatrikLundell 0916d69373 Added coal search to embark-assistant 2018-12-04 14:57:44 +01:00
PatrikLundell 8f9cbfeafd Added coal search to embark-assistant 2018-12-04 14:57:23 +01:00
PatrikLundell 1ef7f0746c Added coal search to embark-assistant 2018-12-04 14:56:55 +01:00
PatrikLundell efeb0504cc Added coal search to embark-assistant 2018-12-04 14:55:59 +01:00
PatrikLundell 5f6376e76e Added coal search to embark-assistant 2018-12-04 14:55:16 +01:00
PatrikLundell 32aaa37070 Added coal search to embark-assistant 2018-12-04 14:54:28 +01:00
lethosor b913076451 Update xml, stonesense, changelog
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
lethosor 368f8d0504 Remove and replace checks for OnBreak 2018-11-24 14:52:26 -05:00
Lethosor 34b8a41ad9
Merge pull request #1403 from BenLubar/imgbot
[ImgBot] optimizes images
2018-11-14 16:43:36 -05:00
billw2012 fefef2e121 Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged. 2018-08-31 20:53:06 +01:00
ImgBotApp 0809de2d56
[ImgBot] optimizes images
*Total -- 141.35kb -> 100.12kb (29.17%)

/reversing/doc/building-facing/screw/4.png -- 2.68kb -> 1.46kb (45.67%)
/reversing/doc/building-facing/screw/2-windows.png -- 4.59kb -> 2.54kb (44.59%)
/docs/images/hotkeys.png -- 56.84kb -> 31.62kb (44.38%)
/reversing/doc/building-facing/screw/3.png -- 2.62kb -> 1.48kb (43.58%)
/reversing/doc/building-facing/screw/2.png -- 2.68kb -> 1.53kb (43.18%)
/reversing/doc/building-facing/screw/1.png -- 2.66kb -> 1.56kb (41.58%)
/reversing/doc/building-facing/horizontal_axle/1.png -- 2.74kb -> 1.62kb (40.83%)
/reversing/doc/building-facing/horizontal_axle/2.png -- 2.78kb -> 1.66kb (40.32%)
/reversing/doc/building-facing/waterwheel/linux.png -- 3.94kb -> 2.76kb (29.89%)
/reversing/doc/building-facing/horizontal_axle/2-windows.png -- 14.74kb -> 12.88kb (12.63%)
/reversing/doc/building-facing/bridge/linux1.png -- 13.42kb -> 11.85kb (11.7%)
/reversing/doc/building-facing/bridge/windows.png -- 15.11kb -> 13.71kb (9.32%)
/reversing/doc/building-facing/waterwheel/windows.png -- 16.52kb -> 15.46kb (6.45%)
2018-08-30 06:18:07 +00:00
billw2012 239d4a8c46 Attempt to full exclude disabled labors from all relevant calculations. 2018-08-26 13:38:03 +01:00
PatrikLundell 73e7ffff83 Made cancel state sensitive 2018-08-18 18:03:00 +02:00