73de6a3051
Update xml
2015-06-15 12:58:49 -04:00
6fb6645ed5
Merge branch 'dwarfmonitor-widgets' into develop
2015-06-15 12:55:26 -04:00
862389d217
Allow lua scripts to redirect to other lua scripts
...
Addresses #634 , #638
2015-06-14 11:56:14 -04:00
4c3ae91e98
Respect TRAVIS_REPO_SLUG environment variable when checking PRs
2015-06-14 11:54:25 -04:00
d07bf6f8ed
Add a script to simulate a complete travis build
2015-06-14 11:53:49 -04:00
8132e34240
Update readme with hack-wish rename.
2015-06-13 21:24:59 -07:00
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
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
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
dd8c5195e5
Update NEWS with hack-wish rename.
2015-06-13 02:43:17 -07:00
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
09bcbe583d
Update NEWS
2015-06-12 20:58:43 -04:00
67203e1ddd
Merge pull request #635 from warmist/patch-2
...
gui/gm-editor changes
2015-06-12 20:55:20 -04:00
00251386f5
fix spelling mistake
2015-06-13 00:02:12 +03:00
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
06cf6530fc
Merge branch 'search-noble-suggestions' into develop
2015-06-11 21:38:57 -04:00
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
c788b175a9
Merge pull request #633 from scamtank/scam-viewiteminfo
...
Rebuilt missing half of plant product descriptions
2015-06-11 20:37:01 -04:00
64c92802c2
String.find(k) into k:find
...
Looks neater already.
2015-06-12 03:22:05 +03:00
01a3ed627f
Just delete the thing
...
If there's need for the DRINK_MAT thing again, it's no big deal to write it back.
2015-06-12 00:53:49 +03:00
d049f79d08
Make second function do what the first won't
...
Dummy out the DRINK_MAT lookup in the first one to stop the overlap, make the second one look up all the stuff that the first one expects to find with material reaction product tokens.
2015-06-12 00:10:50 +03:00
435178807f
Merge pull request #3 from DFHack/develop
...
Resyncing
2015-06-11 23:33:42 +03:00
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
d663784707
Detect null unit pointer in Items::createItem()
2015-06-09 14:02:42 -04:00
bb93f2e40f
Fix circular lua script dependencies
2015-06-05 19:08:11 -04:00
84d37ebfc7
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-06-05 18:46:26 -04:00
36fde3d7e3
Allow Lua screens to allow OPTIONS to work
2015-06-05 18:45:52 -04:00
20bd56e7f4
Merge pull request #627 from scamtank/scam-viewiteminfo
...
Fixed elasticity descriptions
2015-06-05 16:04:43 -04:00
8336e831d2
Fixed elasticity descriptions
...
Previous order of comparisons would describe any amount of strain at yield below 50000 as "elastic". Flip the order of checks and it works as intended. Seems like a simple mistake, I don't think this'll break anything else.
2015-06-05 19:59:28 +03:00
b1187439ee
Merge pull request #626 from scamtank/scam-itemdescript
...
Add format guide to item-descriptions.lua
2015-06-05 12:57:39 -04:00
01ee8b97b2
Add format guide to item-descriptions.lua
...
Including a short list of the screen's limitations would be a good idea, I think.
2015-06-05 18:24:02 +03:00
091f53a9e1
Merge branch 'describe-items' into develop
...
Closes #619
2015-05-30 17:12:34 -04:00
551e90788a
Add wesQ3 to Contributors.rst
2015-05-30 17:12:20 -04:00
942f451358
Finish item descriptions, test, document
2015-05-30 17:11:00 -04:00
b86214e0e1
Final item descriptions
2015-05-30 17:10:59 -04:00
9dcc49aec5
Descriptions - nine weapons and tools to go
2015-05-30 17:10:59 -04:00
0b0fd18c31
Yet more descriptions - 30 to go
2015-05-30 17:10:59 -04:00
e58ab09d86
More descriptions
...
Just 40 items to go - all subtypes of shield, weapon, tool, helm, or
gloves!
2015-05-30 17:10:59 -04:00
5d4bccb800
List wesQ3 as contributor
2015-05-30 17:10:58 -04:00
07ed843737
Describe wood, table, quern, millstone
2015-05-30 17:10:55 -04:00
bec0150669
Many more descriptions - 54 to go!
2015-05-27 09:31:04 +10:00
de2724062d
Several more descriptions
2015-05-26 23:55:18 +10:00
e929760f6b
Described jewelery
2015-05-26 21:09:59 +10:00
711a817e88
Added some more descriptions
...
Thanks to /u/Puffin4Tom and /u/KroyMortlach
2015-05-26 20:58:16 +10:00
3bd258816f
Merge branch 'develop' of https://github.com/DFHack/dfhack into describe-items
2015-05-26 17:28:29 +10:00
lethosor
Putnam3145
Fukken-Saved
Lethosor
warmist
scamtank
Japa
Peridexis Errant
Wes Malone