3ebe59859b
box-select: Fix "tiles to fill" count
2015-11-06 20:04:54 -05:00
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05:00
e9be1aa657
Fix for construction over existing construction & on top of walls
...
Fix to allow constructions on top of (natural) down stairs
2015-11-06 19:00:43 +01:00
29533f1f08
Minor sphinx fixes
...
* Exclude build directories (rst files are copied into them by CPack)
* Fix CMake dependency path to conf.py
* Build in parallel
2015-11-05 22:57:09 -05:00
e15dcfd72a
protobuf: Disable unused-result warnings in release mode
2015-11-05 21:52:04 -05:00
867b733a04
Fix a few GCC warnings on Linux (GCC 4.6)
2015-11-05 21:48:13 -05:00
2f8f5b071a
Merge pull request #730 from PeridexisErrant/add-scripts
...
Add updated emigration script, gui/family-affairs
2015-11-05 19:55:15 -05:00
ac4927d409
Update scripts/3rdparty/* (docs)
2015-11-05 19:38:47 -05:00
7fc2a226da
Add missing backtick
2015-11-05 19:37:51 -05:00
8a0f54aef3
Only install HTML docs
2015-11-05 19:37:37 -05:00
5c4e28dbff
Fix initial cursor position with initial entry
2015-11-05 19:09:35 -05:00
8412a496dd
Remove extra check for "type" command
2015-11-05 19:09:14 -05:00
23b02ebcf2
Update xml
2015-11-05 16:17:52 -05:00
efe945cfd9
Add new scripts to NEWS
2015-11-05 21:54:45 +11:00
3623659a9b
Add emigration script
2015-11-05 16:40:35 +11:00
e2a1658124
Update xml
2015-11-04 21:42:04 -05:00
45c3f145e5
Add gui/family-affairs
2015-11-05 13:17:26 +11:00
b01d79e502
Update scripts/3rdparty submodules
2015-11-04 20:08:34 -05:00
ac8038fa79
Update stonesense
2015-11-04 20:06:35 -05:00
481d00433d
Only search scripts directory with GLOB_RECURSE
2015-11-04 19:54:41 -05:00
cbf31dcb37
Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop
2015-11-04 19:54:13 -05:00
731fb4eb0a
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-11-03 14:22:12 -05:00
ea38404727
Added bridge direction.
2015-11-03 22:38:07 +05:30
3fd4b01829
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-03 18:50:00 +05:30
f5ca3f9e7b
Made the direction info more meaningful.
2015-11-03 18:49:17 +05:30
d692458038
Formatting
2015-11-03 10:07:27 +01:00
cb22e2639e
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-11-02 22:29:09 -05:00
f7a5574e9a
Merge pull request #726 from DoctorVanGogh/zone-typo
...
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
923ce36323
zone: Fix typo in help text
2015-11-03 03:55:04 +01:00
1fe96e7093
Merge pull request #724 from Putnam3145/patch-21
...
minor typo fix
2015-11-02 21:39:02 -05:00
5e727b301d
minor typo fix
2015-11-02 10:51:23 -08:00
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
a7fe1d9d73
Formatting
2015-11-02 05:05:17 +01:00
092979f362
Prevent building floor on top of constructed floor (mostly)
2015-11-02 02:51:52 +01:00
6df0e26b05
Require 3rdparty docs to be in script source files
2015-11-02 09:32:50 +11:00
28940b9b8a
Temporarily disable 3rdparty/roses
...
See #712
2015-11-01 17:25:36 -05:00
14707e7d81
Merge pull request #719 from DoctorVanGogh/r3compat
...
Allow loading (external) plugins compiled against r3
2015-10-31 19:12:07 -04:00
c6220c9703
Remove tabs/trailing whitespaces
2015-10-31 23:43:57 +01:00
21ace4249a
Add 3rd-party script authors
2015-10-31 16:52:47 -04:00
73e871231f
Update 3rd-party scripts
2015-10-31 15:27:16 -04:00
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
6c832fadba
Add DoctorVanGogh to Authors.rst
...
See #715
2015-10-31 11:55:05 -04:00
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
6e5d9c23e5
Merge pull request #715 from DoctorVanGogh/webfix
...
Add 'undisturbed' flag to job item checks
2015-10-31 11:28:25 -04:00
e11ce3bff4
Merge develop
2015-10-31 15:46:41 +11:00
9b1d277ef5
Finish updating sphinx-build changes
...
Completes 5643119
2015-10-31 15:39:00 +11:00
b7a69846d9
Fix travis.yml syntax issue
2015-10-30 23:30:06 -04:00
68ae59d4bc
log git commit in travis build
2015-10-30 23:11:14 -04:00
aa2ada4cbc
Use TRAVIS_BRANCH environment variable
...
Ref #713
2015-10-30 22:58:58 -04:00
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
DoctorVanGogh
Lethosor
PeridexisErrant
Japa
Putnam3145