Commit Graph

11765 Commits (888288212bd998c281532cac5141ed35244f9c39)
 

Author SHA1 Message Date
lethosor 731fb4eb0a Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-11-03 14:22:12 -05:00
Japa ea38404727 Added bridge direction. 2015-11-03 22:38:07 +05:30
Warmist 0fa35aef3c Update eventful.cpp
Fix furnace hook not being called.
2015-11-03 18:01:41 +02:00
Warmist a503e54484 Add furnaces to sidebar fill event 2015-11-03 17:59:24 +02:00
Japa 3fd4b01829 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-11-03 18:50:00 +05:30
Japa f5ca3f9e7b Made the direction info more meaningful. 2015-11-03 18:49:17 +05:30
DoctorVanGogh d692458038 Formatting 2015-11-03 10:07:27 +01:00
lethosor cb22e2639e Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-11-02 22:29:09 -05:00
Lethosor f7a5574e9a Merge pull request #726 from DoctorVanGogh/zone-typo
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
DoctorVanGogh 923ce36323 zone: Fix typo in help text 2015-11-03 03:55:04 +01:00
Lethosor 1fe96e7093 Merge pull request #724 from Putnam3145/patch-21
minor typo fix
2015-11-02 21:39:02 -05:00
Putnam3145 5e727b301d minor typo fix 2015-11-02 10:51:23 -08:00
Japa b4b90465c2 Added building direction to remotefortressreader.cpp for those buildings that have it in a meaningful way. 2015-11-02 23:22:58 +05:30
DoctorVanGogh a7fe1d9d73 Formatting 2015-11-02 05:05:17 +01:00
DoctorVanGogh 092979f362 Prevent building floor on top of constructed floor (mostly) 2015-11-02 02:51:52 +01:00
PeridexisErrant 6df0e26b05 Require 3rdparty docs to be in script source files 2015-11-02 09:32:50 +11:00
lethosor 28940b9b8a Temporarily disable 3rdparty/roses
See #712
2015-11-01 17:25:36 -05:00
Lethosor 14707e7d81 Merge pull request #719 from DoctorVanGogh/r3compat
Allow loading (external) plugins compiled against r3
2015-10-31 19:12:07 -04:00
DoctorVanGogh c6220c9703 Remove tabs/trailing whitespaces 2015-10-31 23:43:57 +01:00
lethosor 21ace4249a Add 3rd-party script authors 2015-10-31 16:52:47 -04:00
lethosor 73e871231f Update 3rd-party scripts 2015-10-31 15:27:16 -04:00
lethosor 96834923b9 Clean up Authors.rst
* Remove email addresses, following a discussion on IRC (these can be
  found in git logs anyway, and having them publicly-visible invites
  spam)
* Remove a couple duplicate authors
* Add a few aliases
2015-10-31 12:01:52 -04:00
lethosor 6c832fadba Add DoctorVanGogh to Authors.rst
See #715
2015-10-31 11:55:05 -04:00
lethosor 45284fab17 Sort Authors.rst alphabetically
Previous changes combined the list of dfhack and stonesense
contributors, which interfered with the old, somewhat-time-based
order.
2015-10-31 11:51:12 -04:00
Lethosor 6e5d9c23e5 Merge pull request #715 from DoctorVanGogh/webfix
Add 'undisturbed' flag to job item checks
2015-10-31 11:28:25 -04:00
PeridexisErrant e11ce3bff4 Merge develop 2015-10-31 15:46:41 +11:00
PeridexisErrant 9b1d277ef5 Finish updating sphinx-build changes
Completes 5643119.
2015-10-31 15:39:00 +11:00
lethosor b7a69846d9 Fix travis.yml syntax issue 2015-10-30 23:30:06 -04:00
lethosor 68ae59d4bc log git commit in travis build 2015-10-30 23:11:14 -04:00
lethosor aa2ada4cbc Use TRAVIS_BRANCH environment variable
Ref #713
2015-10-30 22:58:58 -04:00
PeridexisErrant f080e42c22 Add pull #717 changes to NEWS
Since it didn't happen there due to merge issues.
2015-10-31 11:47:13 +11:00
lethosor 7da3c65079 Fix display of arrows in lua filtered list widgets
Fixes #718
2015-10-30 19:16:29 -04:00
lethosor 83991d2a22 plug: Don't color loaded plugins 2015-10-30 18:45:55 -04:00
lethosor db6f4cf6a0 Merge branch 'autolabor-civ-permitted' into develop 2015-10-30 18:42:36 -04:00
lethosor ac71fa8070 Add isValidLabor() to Units module
Closes #711 and could avoid potential issues when editing units from
other civs with manipulator.
2015-10-30 18:41:09 -04:00
Lethosor 54996d9543 Merge pull request #717 from PeridexisErrant/state-of-decay
State of decay - Onmiclasm's FPS boosting scripts
2015-10-30 18:27:46 -04:00
lethosor ff4f7203c5 Update stonesense 2015-10-30 17:08:39 -04:00
PeridexisErrant 4257940b22 fix typo in dig docs 2015-10-30 14:47:49 +11:00
PeridexisErrant 5643119c71 Get docs building online
Readthedocs runs the build command in the directory conf.py is found,
and to work correctly that has to be the root directory.
2015-10-29 14:26:37 +11:00
PeridexisErrant a8ab595428 Tweak plugins docs
- Minor updates and clarifying edits
- Better use of markup throughout the document
- linked references to bugs and other things
- moved gui/siege-engine docs to the script
2015-10-29 12:46:31 +11:00
PeridexisErrant 92cd313776 Improve markup in scripts documentation
Plus minor changes for clarification.
2015-10-29 12:44:49 +11:00
PeridexisErrant 94cadbf1ec Add FPS-boosting 'state of decay' scripts
By Omniclasm.
http://www.bay12forums.com/smf/index.php?topic=150782.msg6482346#msg6482346
2015-10-28 21:13:17 +11:00
PeridexisErrant 056c1bcb2d Document new scripts 2015-10-28 10:18:44 +11:00
PeridexisErrant aee2655886 Merge branch 'develop' of https://github.com/DFHack/dfhack into NEWS-cleanup 2015-10-28 10:07:13 +11:00
PeridexisErrant a37ae8dbd2 Improve travis checks for branch, script docs
The change to pr-check-base avoids failing builds which should pass
because the GH API is limited.  It'll still work almost all of the time,
but no longer fail builds which previously passed and then pushed more
commits.  Closes #694.
2015-10-28 10:07:02 +11:00
PeridexisErrant 5efea525e0 Split GitHub README from Sphinx index
The root of the documentation tree has a different function to the short
readme we want to display on GitHub, which now links to the main docs
(or Bay12 thread, or IRC).  It also renders properly on GitHub, and can
use live-updating status badges because we don't expect it to work
offline.
2015-10-28 10:06:28 +11:00
lethosor 1250bb5204 type: Provide more useful information (script paths, plugin names) 2015-10-27 17:34:32 -04:00
lethosor d58c9019be alias migrants-now -> devel/migrants-now 2015-10-27 17:33:51 -04:00
lethosor 74860e2904 Add spawnunit wrapper
See #716
2015-10-26 21:02:38 -04:00
lethosor 7dd091e57a create-unit: add nickname option 2015-10-26 21:02:03 -04:00