Commit Graph

6789 Commits (39086acf64b246a34a663e4c7293dc4e2b2aec01)
 

Author SHA1 Message Date
PeridexisErrant 27cee0525c Change back to default make.bat name
We'll need to hook building docs into the main build process at some
point, but this is good for now.
2015-09-23 14:21:10 +10:00
PeridexisErrant 5ba656bf79 Include changelog and licenses in generated docs
We may want to use .rst formatting for these eventually, and maybe move
the NEWS file to docs/News.rst and docs/History.rst - but for now
including the raw text works well enough.
2015-09-23 11:03:26 +10:00
PeridexisErrant 9d1baac6a0 Note issue with multidimensional arrays in lua
Closes #597.  Also remove old TODO in readme.
2015-09-23 10:38:46 +10:00
PeridexisErrant bc5f7f329a Add top-level redirect page for the docs
Because otherwise the pretty docs are buried and that doesn't help
anyone.
2015-09-23 10:17:25 +10:00
lethosor 788860efb6 Log more information about version information on startup
May help address #653
2015-09-22 20:01:05 -04:00
PeridexisErrant 8dc0e1a66e Clean up in dev-oriented docs 2015-09-23 00:06:56 +10:00
PeridexisErrant 8141de869b Split readme into files for scripts, plugins, and base
The plugin docs are still a mess, but the base and scripts are now close
to manageable.
2015-09-22 23:30:22 +10:00
PeridexisErrant eb5286dd86 Misc changes for better structure 2015-09-22 18:42:15 +10:00
PeridexisErrant 336f8ee611 Name index.rst -> README.rst for Github integration 2015-09-22 18:26:56 +10:00
PeridexisErrant a5d1211fea Moved documentation to docs directory 2015-09-22 18:15:07 +10:00
PeridexisErrant 4a8bf96bd3 Standard basic sphinx setup 2015-09-22 17:42:15 +10:00
expwnent 4190ba3259 Fix .gitmodules. 2015-09-21 20:38:31 -04:00
expwnent 0568edb6e3 Attempt to fix gitmodule remote urls manually. 2015-09-21 19:39:01 -04:00
expwnent dc4dc54912 Add third party script submodules. 2015-09-21 19:34:16 -04:00
lethosor 60ed4a1a50 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-09-21 19:25:58 -04:00
lethosor 62c903b7be search: Fix crash when disabling a stockpile category
Closes #678
2015-09-21 19:25:20 -04:00
expwnent 3a75d9c87f Merge pull request #692 from expwnent/travis
Move to new travis infrastructure.
2015-09-21 19:09:53 -04:00
expwnent 8c4fb7668d Merge remote-tracking branch 'dfhack/develop' into travis 2015-09-21 19:04:31 -04:00
lethosor 690cfb54a1 pr-check-base: Show more information about HTTP errors 2015-09-21 19:02:23 -04:00
expwnent e707e01221 travis: Try pip again. 2015-09-21 18:59:12 -04:00
lethosor 91a1836439 Fix a few issues with init file variations
* GCC does not allow std::string instances or enums without a base
  type to be passed as varargs
* Fixed path concatenation issue causing dfhack.init to not be loaded
2015-09-21 18:57:58 -04:00
expwnent f80aa7fd2e travis: Try python-docutils package. 2015-09-21 18:50:21 -04:00
expwnent 5b85ea1314 Attempt to move to new travis infrastructure. 2015-09-21 18:38:11 -04:00
expwnent 0a4f55b7dd Merge pull request #691 from expwnent/vjek
Vjek scripts
2015-09-21 18:27:42 -04:00
expwnent cb0591f315 Fix indentation in Vjek scripts. 2015-09-21 18:25:16 -04:00
expwnent 93ce64a32c Merge remote-tracking branch 'peridexis/vjek-scripts' into vjek 2015-09-21 18:07:00 -04:00
expwnent b60a7fda43 Merge pull request #690 from expwnent/develop
Develop
2015-09-21 17:52:06 -04:00
expwnent b532a56790 Merge remote-tracking branch 'dfhack/develop' into develop 2015-09-21 17:48:34 -04:00
expwnent 0b06f2c719 Merge remote-tracking branch 'warmist/advfort' into develop 2015-09-21 17:47:16 -04:00
expwnent 47378d4b85 Merge branch 'luasocket' into develop 2015-09-21 17:46:47 -04:00
expwnent fabcfcd921 Fixed trailing whitespace. 2015-09-21 17:42:30 -04:00
expwnent 2c9b268184 Merge pull request #689 from expwnent/develop
Generalize dfhack.init so it looks for more files in more places, for onload, onunload, etc.
2015-09-21 17:33:52 -04:00
expwnent af90d14cb2 Use shenanigans to make a certain table const. 2015-09-21 17:24:51 -04:00
Warmist 7974945fb6 Whitespace fix. 2015-09-21 21:11:48 +03:00
Lethosor 827b364fba Merge pull request #685 from warmist/patch-4
Fix flag editing bug in gm-editor
2015-09-20 16:32:07 -04:00
Warmist 3cd4b90db8 Fixes and minecart improvements
added output to clear_jobs of number of cleared jobs
another failed attempt at gather plants fix
added track stop configuration window
2015-09-20 20:46:13 +03:00
warmist 88d65b18a1 Fix bug in gm-editor
Fix a small bug that broken some flag editing.
2015-09-20 18:10:19 +03:00
lethosor 051a1f9661 Update xml 2015-09-19 18:00:59 -04:00
lethosor 7f575a8fd1 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-09-19 17:43:33 -04:00
lethosor a56a427d12 Make Filesystem::is* functions handle nonexistent paths properly
If stat() failed, these functions could read from an uninitialized
stat struct and return "true" for paths that didn't exist.
2015-09-19 17:34:58 -04:00
Warmist 1b924cdc79 Fixes to carving. Added unsafe checking. 2015-09-19 12:18:30 +03:00
Warmist e851543e1a Fix crash bug in advfort when failing almost constructed job. 2015-09-18 20:32:33 +03:00
Japa 129218d5f8 fix whitespace. 2015-09-16 23:29:21 +05:30
Japa ed07a8478b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-16 23:27:04 +05:30
Japa e49272854c Add basic army info to RemoteFortressReader.proto 2015-09-16 23:26:52 +05:30
Japa 5ce6fceacc Send the center with the world map, based off current embark if available, otherwise adventurer position. 2015-09-16 23:25:23 +05:30
Warmist 5c6a80037f Fix cooking allow using cooked meals as ingredient. 2015-09-16 14:05:29 +03:00
Warmist 80fd4b1365 Some additions and fixes.
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
expwnent 5bf3093139 Now it looks for dfhack*.init instead of just dfhack.init, onLoad*.init instead of just onLoad.init, etc. 2015-09-15 07:27:42 -04:00
expwnent 7f7da945a6 Merge pull request #658 from warmist/patch-3
Create gm-unit.lua
2015-09-15 03:41:07 -04:00