MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,738 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

7738 Commits (9f18cb5bdcab50b35301d167f65f7e0dd9ef1016)
 

Author SHA1 Message Date
lethosor caa1b9f355 Update NEWS.rst 
Ref #804, #812
 2016-04-24 17:12:13 -04:00
lethosor 24fd47c030 Bump to r1 in CMakeLists.txt 2016-04-23 22:02:39 -04:00
lethosor 402a96b0e6 Expose new unit functions to lua and add some basic safety checks 2016-04-23 21:52:50 -04:00
lethosor f66dd77a72 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-04-23 20:33:25 -04:00
lethosor bc7c689d93 update xml 2016-04-23 20:33:03 -04:00
lethosor 5418233117 to_string -> int_to_string 2016-04-22 20:27:53 -04:00
lethosor fd54003384 More make_pair replacements 2016-04-22 20:26:07 -04:00
lethosor ec42967996 Use std::make_pair instead of initializer lists 2016-04-22 19:43:05 -04:00
lethosor 8784a133e8 Initialize maps in a MSVC 2010-compatible way 2016-04-22 18:45:32 -04:00
lethosor 52728babd4 Merge branch 'develop' into zone-unassign 2016-04-22 18:41:15 -04:00
AtomicChicken 68267d2ab3 Update item-trigger.lua 
whitespace removed
 2016-04-20 12:05:48 +02:00
AtomicChicken 0d8a80c2ec Update item-trigger.lua 
added proper indentation
 2016-04-20 11:08:49 +02:00
PeridexisErrant acac839371 Replace fixdiplomats, fixmerchants with scripts 2016-04-20 11:12:06 +10:00
AtomicChicken 9319ebfba0 Update item-trigger.lua 
Fixed an error caused by item-trigger attempting to handle item types which lack a subtype, whilst simultaneously adding support for such items.
 2016-04-19 15:47:05 +02:00
Japa 856c3b06f4 Added dig designations to remotefortressreader.cpp 2016-04-19 19:15:33 +05:30
Japa 1317792cde Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-19 18:17:39 +05:30
Lethosor 50f2851772 Merge pull request #742 from PeridexisErrant/ls-cleanup 
Ls cleanup
 2016-04-17 17:59:22 -04:00
lethosor 9f95293e3e Add df.type.find() dialog to gm-editor 2016-04-17 16:41:46 -04:00
lethosor b36193857c Add string:startswith(), endswith() 2016-04-16 17:13:41 -04:00
lethosor 8226134f67 Make can_trade() return true if at least one caravan can trade 
Fixes #900
 2016-04-16 17:13:00 -04:00
PeridexisErrant 205e5cd371 Un-break script doc checker 
This handles any number of empty lines above the title, including zero -
a harmless case which was breaking the build.
 2016-04-15 16:51:24 +10:00
PeridexisErrant eb34ff0cd6 Fix typos and missing links in docs 2016-04-15 16:28:41 +10:00
PeridexisErrant ae81454786 Minor fixes, space no longer required 
Thanks to 2882422
 2016-04-15 16:28:41 +10:00
PeridexisErrant 273c22f606 Shorten "ls" help for plugins 
I think that's all of them.
 2016-04-15 16:28:41 +10:00
PeridexisErrant 403e9f60b2 More informative "ls" messages 
Because printing the name of the script doesn't help; it's already on
the left!
 2016-04-15 16:28:41 +10:00
PeridexisErrant fc9e2fbff7 Shorten wrapped "ls" descriptions in scripts 2016-04-15 16:28:41 +10:00
PeridexisErrant feff83cedc Require a short help string for "ls" 
The linter change will enforce it for scripts.  Plugins always include
the line, and length will have to be checked manually.
 2016-04-15 16:28:41 +10:00
lethosor 0d37209063 use trade_state enum 2016-04-13 09:44:57 -04:00
lethosor 3ab963499a Bump to beta1 2016-04-12 21:30:25 -04:00
lethosor 7fe142ea76 add many missing section anchors to Plugins.rst 2016-04-12 20:09:41 -04:00
lethosor e7fba67a72 run sphinx-build in parallel 2016-04-12 20:09:27 -04:00
lethosor a92b67c80d Add ability to edit min/max logs and remove cap 
Closes #893
 2016-04-12 19:52:51 -04:00
lethosor 999d89c5af Fix tile background colors in CopyScreen 2016-04-12 17:10:54 -04:00
lethosor f18ebf120b Merge remote-tracking branch 'PeridexisErrant/dev-docs' into develop 2016-04-10 23:18:19 -04:00
lethosor daadc2ef85 Update stonesense 2016-04-10 20:11:52 -04:00
PeridexisErrant 4536f3df71 Fix last typos 2016-04-11 09:30:05 +10:00
PeridexisErrant b03e8f26d4 Don't cover error by re-running Sphinx 2016-04-11 09:30:05 +10:00
PeridexisErrant c2b4ee8d64 Ready for Stonesense docs PR 2016-04-11 09:30:05 +10:00
PeridexisErrant c09b4f6b47 Tweak developer docs 2016-04-11 09:30:05 +10:00
PeridexisErrant 4b9696d295 Fix html redirection to the docs 
Now redirects from top level to user-default location, and
if you're in the repo there's a new second redirect to the real docs.
 2016-04-11 09:30:05 +10:00
PeridexisErrant faec3b0cbc Use local tables of contents in Plugins.rst 
Makes it a lot easier to navigate the structure of the file.
 2016-04-11 09:30:05 +10:00
PeridexisErrant 7ebd50697e Better formatting, TOCs in Lua API.rst 2016-04-11 09:30:05 +10:00
PeridexisErrant e0310e3050 Seperate HISTORY from NEWS 
Because years-old information is not news any more!
 2016-04-11 09:30:05 +10:00
PeridexisErrant b8bb8d0c92 Finish formatting, linking NEWS.rst 2016-04-11 09:30:05 +10:00
PeridexisErrant eaa08fd2a5 Fail build on documentation error 
-qW is 'run silently, warnings as errors'.

I think this is appropriate to catch eg broken internal links, since we
also fail builds for missing script docs.
Shame it only runs to first warning in this mode; so run again emitting
all errors.
 2016-04-11 09:30:05 +10:00
lethosor 2399539990 Merge remote-tracking branches 'warmist/patch-7', 'warmist/patch-8' and 'warmist/patch-9' into develop 2016-04-10 11:58:48 -04:00
Warmist 812f6df272 Fix building-hacks color for auto_gears option 
Now it should select the gear color correctly
 2016-04-10 16:55:08 +03:00
Warmist 7c91b8f755 Add more informative focus_path 
This with conjunction of changes in eventful will make the sidebar overlay more bug-free :)
 2016-04-10 16:53:18 +03:00
Warmist c4c452c288 Show sidebar when moving from screen to screen 
When both are from lua the old logic failed.
 2016-04-10 16:51:58 +03:00
Warmist 8b8ce4eff9 Spelling mistake 2016-04-10 15:45:43 +03:00