Commit Graph

6424 Commits (f2696cfd3d530115a98a6d48a9665c9bf5dccb34)
 

Author SHA1 Message Date
lethosor 6cfc855e19 Use getcwd() in Process::getPath() on OS X
The "dfhack" script sets up the proper working directory
2015-06-29 10:11:46 -04:00
lethosor 0f3753095b update xml 2015-06-29 10:10:44 -04:00
lethosor 2c734233eb New tweak: kitchen-keys
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614

See #526
2015-06-27 11:02:26 -04:00
lethosor 3795edb673 Fix colors in 'tweak kitchen-prefs-color' 2015-06-27 09:54:31 -04:00
lethosor 716ce1c9e2 Update xml 2015-06-26 23:20:59 -04:00
lethosor 4246dbd02a New tweak: kitchen-prefs-color
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
lethosor 8d21dd0a23 New tweak: kitchen-prefs-empty
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000

See #526
2015-06-26 23:19:39 -04:00
lethosor 790f967120 Merge branch 'git-describe' into develop 2015-06-26 21:10:13 -04:00
lethosor 935f4dd628 Log plugin load information to stderr 2015-06-26 16:11:41 -04:00
lethosor 5d1ae9f5ed Allow plugins without git description to be loaded 2015-06-25 11:46:04 -04:00
lethosor 524593a3d3 Locate git with find_package 2015-06-25 11:43:54 -04:00
lethosor ee7a2c7db7 Add git commit information to libdfhack-version
git is run every time 'make' is run, but the generated include file
is only updated when necessary. Plugins will be loaded successfully
if their DFHack version matches core's (assuming OpenLibrary()
succeeds), but will produce a warning if their git commit doesn't
match core's.
2015-06-24 19:32:45 -04:00
lethosor 0fa5570349 Recognize newline characters in Linux/OS X console 2015-06-24 00:54:12 -04:00
lethosor 38d377f4c4 Fix a few zone plugin crashes
* Avoid checking building types of null pointers
* Detect selected cages properly

Fixes #646
2015-06-23 21:21:21 -04:00
lethosor 01c4d4540b Add a gui/hack-wish alias for gui/create-item 2015-06-23 11:27:43 -04:00
lethosor 605a2ede64 Merge branch 'fixster-cleanup' into develop 2015-06-23 11:26:22 -04:00
lethosor 66525ee92d fix-ster.lua: Improve style and fix handling of units with no souls
* Remove unnecessary "return" statements
* Use s:foo() instead of string.foo(s)
* Allow use as a module

Fixes #645
2015-06-22 23:39:43 -04:00
lethosor f3d91b3606 Update xml 2015-06-22 23:16:28 -04:00
Lethosor c9f7fcfd05 Merge pull request #640 from lethosor/search-look-list
Add look menu search
2015-06-22 08:44:34 -04:00
Japa 33cb5e951f Fixed whitespace and returns. 2015-06-22 18:01:19 +05:30
Japa a071f5bf6c Added preliminary building list to remotefortressreader. Untested. 2015-06-22 00:40:17 +05:30
Japa 96640c837f Made remotefortressreader send an item list, and the item that constructions are made from. 2015-06-20 22:17:35 +05:30
Japa 4182a30cc5 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-06-19 23:30:47 +05:30
Japa 4b05423e58 Made remotefortressreader send proper indices for inbuilt materials. 2015-06-19 23:28:32 +05:30
lethosor 5bb5d87ad8 Install default dfhack-config files
Files from the "dfhack-config" source directory are now installed to
"dfhack-config/default" and copied to "dfhack-config" on startup if
they don't already exist. Previously, config files weren't available
at all unless they were manually installed (93c9a41).
2015-06-18 08:59:01 -04:00
lethosor a8480070a0 Add look menu search 2015-06-16 20:36:19 -04:00
lethosor 81cba0b0fc Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop 2015-06-16 19:56:16 -04:00
lethosor bba85299ea fixTexts.sh: Add --reset option 2015-06-15 13:47:03 -04:00
lethosor 8145a04944 dwarfmonitor: Add mouse cursor widget
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor 4e391603f5 Merge remote-tracking branch 'Putnam3145/patch-20' into develop 2015-06-15 13:06:39 -04:00
lethosor 73de6a3051 Update xml 2015-06-15 12:58:49 -04:00
lethosor 6fb6645ed5 Merge branch 'dwarfmonitor-widgets' into develop 2015-06-15 12:55:26 -04:00
lethosor 862389d217 Allow lua scripts to redirect to other lua scripts
Addresses #634, #638
2015-06-14 11:56:14 -04:00
lethosor 4c3ae91e98 Respect TRAVIS_REPO_SLUG environment variable when checking PRs 2015-06-14 11:54:25 -04:00
lethosor d07bf6f8ed Add a script to simulate a complete travis build 2015-06-14 11:53:49 -04:00
Putnam3145 8132e34240 Update readme with hack-wish rename. 2015-06-13 21:24:59 -07:00
lethosor 7581bda7d5 Update dwarfmonitor documentation and NEWS 2015-06-13 21:50:15 -04:00
lethosor 93c9a41a3a Reimplement dwarfmonitor widgets in Lua (and improve customizability)
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.

Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
  no longer copied into the DF directory when building DFHack. This
  keeps developers' personal settings intact, but will require
  copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Fukken-Saved 9a262ad013 Travis compliance 2015-06-13 14:19:14 -04:00
Fukken-Saved d4c7cd2a4e Update autohauler.cpp 2015-06-13 14:08:42 -04:00
Putnam3145 dd8c5195e5 Update NEWS with hack-wish rename. 2015-06-13 02:43:17 -07:00
Putnam3145 4d20552ef8 Rename gui/hack-wish to gui/create-item
After an [extensive, in-depth discussion about the merits of the name](https://github.com/DFHack/dfhack/issues/634), I decided that "hack-wish" was a dumb name and figure changing it will make everything easier for everyone forever.
2015-06-13 02:41:51 -07:00
Lethosor 09bcbe583d Update NEWS 2015-06-12 20:58:43 -04:00
Lethosor 67203e1ddd Merge pull request #635 from warmist/patch-2
gui/gm-editor changes
2015-06-12 20:55:20 -04:00
warmist 00251386f5 fix spelling mistake 2015-06-13 00:02:12 +03:00
warmist a8a3153de6 gui/gm-editor changes
Add label to show that you can actually (s)earch through lists. Add "]" to displace references (e.g. map blocks and stuff) - will crash stuff you don't know what you are doing.
2015-06-12 23:55:55 +03:00
lethosor 06cf6530fc Merge branch 'search-noble-suggestions' into develop 2015-06-11 21:38:57 -04:00
lethosor 2d121caabc Allow searching noble suggestions in liaison meetings
Closes #622
2015-06-11 21:37:58 -04:00
Lethosor c788b175a9 Merge pull request #633 from scamtank/scam-viewiteminfo
Rebuilt missing half of plant product descriptions
2015-06-11 20:37:01 -04:00
scamtank 64c92802c2 String.find(k) into k:find
Looks neater already.
2015-06-12 03:22:05 +03:00