lethosor
84d37ebfc7
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-06-05 18:46:26 -04:00
lethosor
36fde3d7e3
Allow Lua screens to allow OPTIONS to work
2015-06-05 18:45:52 -04:00
Lethosor
20bd56e7f4
Merge pull request #627 from scamtank/scam-viewiteminfo
...
Fixed elasticity descriptions
2015-06-05 16:04:43 -04:00
scamtank
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
Lethosor
b1187439ee
Merge pull request #626 from scamtank/scam-itemdescript
...
Add format guide to item-descriptions.lua
2015-06-05 12:57:39 -04:00
scamtank
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
lethosor
091f53a9e1
Merge branch 'describe-items' into develop
...
Closes #619
2015-05-30 17:12:34 -04:00
lethosor
551e90788a
Add wesQ3 to Contributors.rst
2015-05-30 17:12:20 -04:00
Peridexis Errant
942f451358
Finish item descriptions, test, document
2015-05-30 17:11:00 -04:00
Peridexis Errant
b86214e0e1
Final item descriptions
2015-05-30 17:10:59 -04:00
Peridexis Errant
9dcc49aec5
Descriptions - nine weapons and tools to go
2015-05-30 17:10:59 -04:00
Peridexis Errant
0b0fd18c31
Yet more descriptions - 30 to go
2015-05-30 17:10:59 -04:00
Peridexis Errant
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
Peridexis Errant
5d4bccb800
List wesQ3 as contributor
2015-05-30 17:10:58 -04:00
Wes Malone
07ed843737
Describe wood, table, quern, millstone
2015-05-30 17:10:55 -04:00
Peridexis Errant
bec0150669
Many more descriptions - 54 to go!
2015-05-27 09:31:04 +10:00
Peridexis Errant
de2724062d
Several more descriptions
2015-05-26 23:55:18 +10:00
Peridexis Errant
e929760f6b
Described jewelery
2015-05-26 21:09:59 +10:00
Peridexis Errant
711a817e88
Added some more descriptions
...
Thanks to /u/Puffin4Tom and /u/KroyMortlach
2015-05-26 20:58:16 +10:00
Peridexis Errant
3bd258816f
Merge branch 'develop' of https://github.com/DFHack/dfhack into describe-items
2015-05-26 17:28:29 +10:00
Peridexis Errant
1ad5fda6b4
Finish item-descriptions.lua templating
2015-05-26 17:27:58 +10:00
lethosor
96f3bdafb4
Implement an internal command to interrupt running Lua scripts
...
This inserts a debug hook that runs every 256 instructions by
default, which has a minimal impact on performance.
2015-05-24 19:06:01 -04:00
lethosor
957b894a80
warn-starving improvements
...
* Display all problems with all units
* Display units' professions if applicable
* Log warnings to the console
* Allow use as a module
* Add an argument to (re-)display all problematic units
See #614
2015-05-24 13:05:46 -04:00
lethosor
de984b1a60
Merge remote-tracking branch 'PeridexisErrant/warn-starving' into develop
2015-05-24 12:35:10 -04:00
lethosor
dc58977301
Add acwatkins to Contributors.rst
2015-05-24 11:49:43 -04:00
lethosor
143cb64e5c
Update NEWS
2015-05-24 11:48:05 -04:00
lethosor
c5f61af172
Merge remote-tracking branch 'acwatkins/feature/fixStuckWorkflowJobs' into develop
2015-05-24 11:44:45 -04:00
lethosor
7baf581b93
Make gui/gm-editor work with lua tables
2015-05-24 11:43:05 -04:00
lethosor
e27493fa02
Treat plugins without a "plugin_dev" symbol as ordinary plugins
2015-05-24 11:42:22 -04:00
Adam Watkins
772ad0372d
Improved issue with workflow job being resumed but never being worked
...
Fixes #487
* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue
* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field
This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
Lethosor
1bb5239e5b
Merge pull request #616 from Putnam3145/patch-19
...
Made teleport work with cursor and handle errors.
2015-05-19 16:42:00 -04:00
Putnam3145
73527cc6eb
Made teleport work with cursor and handle errors.
2015-05-19 13:18:40 -07:00
lethosor
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
lethosor
84b2f814e8
Disable some plugin output on startup
...
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
in dfhack.init-example
2015-05-16 18:23:02 -04:00
lethosor
6278c94775
Update xml
2015-05-16 14:27:17 -04:00
PeridexisErrant
7c3c92dd54
Remove surplus end
2015-05-13 23:04:32 +10:00
PeridexisErrant
1706c28845
FIx documentation typos
2015-05-13 23:01:18 +10:00
PeridexisErrant
2569abcdec
Fix variables na and announcement -> msg
2015-05-13 22:58:34 +10:00
Peridexis Errant
3583004c6d
Add warn-starving.lua
...
With minor changes; it doesn't repeat here.
Closes issue #596 .
2015-05-13 14:49:10 +10:00
lethosor
9b8b95e145
Check for jsonxx submodule in CMakeLists.txt
...
Addresses #603
2015-05-09 19:44:26 -04:00
lethosor
db08df7e50
Update xml
2015-05-09 19:41:19 -04:00
lethosor
a577248a38
Make memview output more readable
2015-05-09 19:41:13 -04:00
lethosor
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
lethosor
b6ec48c99a
Add a macro that allows exported functions to use different names
2015-05-09 09:42:15 -04:00
lethosor
a8f5e683f7
Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop
2015-05-09 09:39:55 -04:00
lethosor
3eb8604d91
Alphabetize NEWS
2015-05-09 09:37:32 -04:00
lethosor
6447695d1f
Merge remote-tracking branch 'PeridexisErrant/add-scripts' into develop
2015-05-09 09:36:51 -04:00
Lethosor
aa7297b7af
Merge pull request #580 from lethosor/lua-enable
...
Allow Lua scripts to implement enable/disable commands and specify other behavior (e.g. "module mode") that they implement
2015-05-09 09:27:40 -04:00
lethosor
a47a5f8b0a
Add an alternative to script_environment() that requires scripts to
...
recognize use as a module
Also document the use of enable/disable with lua scripts
2015-05-09 09:21:00 -04:00
Peridexis Errant
d7717a92ab
Add burial.lua by Putnam
...
It's useful, and why not?
2015-05-09 17:29:03 +10:00