7e8200603c
Fix whitespace
2015-10-13 21:31:14 -04:00
b7406e8944
Merge remote-tracking branch 'Mason11987/patch-1' into develop
2015-10-13 21:25:35 -04:00
8a3e0a47dc
Require MSVC 2010 on Windows
2015-10-13 16:25:38 -04:00
dea78d0627
Put mistakenly removed comments back
2015-10-12 06:02:51 -04:00
db3a1024e1
Fixes to allow open-legends to allow export as well.
2015-10-12 05:59:51 -04:00
2993edaf73
spacing
2015-10-12 05:21:16 -04:00
755b4fa384
Fixing assume identities since it causes a crash.
2015-10-12 05:15:32 -04:00
505b1f0efc
assumed_identities -> identities
...
Fixes #709
2015-10-11 12:03:16 -04:00
d3d21fa371
gm-editor: Make df.global prefix optional
2015-10-11 11:44:52 -04:00
632a809d6f
Update xml
2015-10-11 11:39:16 -04:00
38be023d5d
Fix TiletypeMaterial/tiletype_material comparison
2015-10-10 13:06:14 -04:00
46f6afada7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-10-09 23:35:39 +05:30
30c14ed914
send stockpile and civzone extents in remotefortressreader.cpp
2015-10-09 23:35:12 +05:30
3685ed5156
Fix typo (comfortable)
...
Closes #708
2015-10-07 16:43:02 -04:00
84eb9e6cf8
travis: Increase number of parallel builds
2015-10-03 16:08:13 -04:00
220b73e2a8
Merge remote-tracking branch 'lethosor/travis-build' into develop
2015-10-03 16:06:02 -04:00
c11febf386
Document add-thought
2015-10-03 16:05:37 -04:00
f4a2188e42
Travis: Build DFHack
2015-10-03 15:58:41 -04:00
0337df94de
GCC: Specify C++11 when building protobuf
...
This is necessary to build with GCC 4.6 on Linux (Travis)
2015-10-03 15:40:28 -04:00
5580a255f5
Update stonesense
2015-10-03 14:42:52 -04:00
d71969fef9
Update clsocket
2015-10-03 13:55:16 -04:00
12684f65bd
Reorganize Contributing.rst and fix a few typos
...
This document is shown when creating pull requests and referenced
from a number of other code-related discussions, so putting the
"contributing code" section first probably makes more sense
(particularly with a TOC).
2015-10-03 13:50:52 -04:00
c2267013b4
plug: List enabled state
2015-10-03 13:42:20 -04:00
f874fac500
Consolidate licenses of other dependencies
2015-10-03 13:42:03 -04:00
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
3f5c002634
Pass virtual_identity by reference
2015-10-03 09:27:24 -04:00
d343dfd8a0
Add a function to find viewscreens (or parents) of a given type
...
This makes it possible for some plugins to detect the game state more
reliably - for example, prospector would previously fail when
embarking if the viewscreen_choose_start_sitest instance had any
children.
2015-10-02 21:50:55 -04:00
60bc2619a1
Fix Sphinx error when using Python 2
2015-10-02 21:34:08 -04:00
3b8d5a6a95
Suggest --init flag in missing-submodule messages
2015-10-02 16:59:50 -04:00
ce80a42b24
Typo: accross -> across
...
Closes #707
2015-09-30 16:32:44 -04:00
93a8998268
make-legendary: fix console output on *nix
2015-09-28 20:09:06 -04:00
176bd0b1d2
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-09-28 01:20:27 -04:00
32284dd309
Move script update to proper NEWS section
2015-09-28 01:20:14 -04:00
449e0c7578
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-28 10:07:23 +05:30
5e43b6b2a6
Add buildigs to remotefortressreader.cpp
2015-09-28 10:06:04 +05:30
c93737d6e4
NEWS: Reformat list of Vjek's scripts, add descriptions, fix typo
2015-09-27 22:40:57 -04:00
dcf999a3e5
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-27 04:56:14 -04:00
466c26f093
BUILD_DOCS should be an option.
2015-09-27 04:53:18 -04:00
e33f19f414
Merge pull request #705 from expwnent/develop
...
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:33:54 -04:00
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
a1c76ab5b4
Merge pull request #704 from expwnent/develop
...
Develop
2015-09-27 03:01:16 -04:00
f84ef11341
Whitespace.
2015-09-27 02:59:31 -04:00
1bc9b74530
An attempt to make Sphinx recognize all lua dependencies that still doesn't work.
2015-09-27 02:56:37 -04:00
c15b01a79a
Autogenerate include-all.rst for scripts so that script documentation can be entirely encapsulated in lua files without updating anything else.
2015-09-27 02:45:11 -04:00
094aceff9e
Sphinx: locate dfhack-icon.ico properly.
2015-09-26 20:49:43 -04:00
d6821e6d66
Clean up .travis.yml
2015-09-26 20:05:32 -04:00
345da8b2ed
Comment out roses-init (shouldn't be run from dfhack.init).
2015-09-26 18:06:24 -04:00
6cc399561b
CMake: Only run Sphinx when necessary
2015-09-26 17:52:06 -04:00
792eefee9f
Fix argument to base/roses-init
2015-09-26 17:00:45 -04:00
b16e59b91c
Check for existence of save folder before attempting to log events
...
cur_savegame.save_dir can be populated when the save directory does
not yet exist after world generation (since the game can be aborted
at that stage without saving).
2015-09-26 14:26:44 -04:00
lethosor
Mason11987
Japa
orthographic-pedant
expwnent