100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
b81d57fa06
Update NEWS
2015-02-21 21:54:37 -05:00
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
88ff51c755
Add PushEvent hook on OS X
...
See #553
2015-02-21 21:28:35 -05:00
bd809d7bbc
Replace most interposed functions with dlsym wrappers on OS X
2015-02-21 21:28:35 -05:00
db9bcc27e4
Make plugin load errors more descriptive
2015-02-21 21:28:35 -05:00
51722f3479
Merge pull request #559 from lethosor/dfhack-version-lib
...
Move DFHack version to a separate (static) library
2015-02-21 21:15:57 -05:00
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
18ba5227f4
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-02-19 12:07:03 -05:00
c80fbbc397
Remove AS prefixes from add-spatter.cpp
...
The actual cause of this crash was fixed in #558
See #205
2015-02-19 12:05:32 -05:00
899ab796b4
Merge pull request #558 from DFHack/dlopen-rtld-local
...
Pass RTLD_LOCAL to dlopen()
2015-02-19 11:44:05 -05:00
d9acf50fb5
Pass RTLD_LOCAL to dlopen()
...
May have fixed #205
2015-02-19 11:42:04 -05:00
962df78ff0
Merge branch 'catsplosion' into develop
2015-02-17 14:35:46 -05:00
c8fa44a1b1
Update NEWS
2015-02-17 14:35:30 -05:00
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
a7922937f5
Merge branch 'trackstop-tweaks' into develop
2015-02-17 14:14:06 -05:00
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
89197bc931
Use table in Contributors.rst
2015-02-16 21:54:45 -05:00
c399377f08
Ensure that command usage information always ends with a newline
2015-02-16 20:17:47 -05:00
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
e9cc242322
Merge pull request #555 from lethosor/travis
...
Add .travis.yml and fix whitespace issues
2015-02-16 17:05:29 -05:00
3cc833a3c2
Merge remote-tracking branch 'jlogsdon/yosemite-build' into develop
2015-02-16 13:58:00 -05:00
d14a8b4308
Convert TranslateName output to UTF-8
2015-02-16 13:55:19 -05:00
ded7b5531c
Merge branch 'readme-update' into develop
2015-02-16 09:57:39 -05:00
7972aa2fbc
Fix syntax errors in Readme.rst
2015-02-16 09:56:34 -05:00
944ee2f53a
More readme clarification
...
Fix DF version numbers. Make newlines at headings consistent.
Consistent 4-space indentation where practical. Fix indented blocks.
Remove duplicate sections. Minor editorial fixes.
2015-02-16 18:04:48 +11:00
81b67721c8
Disable travis email notifications
2015-02-15 13:25:00 -05:00
3a5cd754dd
Verify that pull requests are based on develop
2015-02-15 13:23:39 -05:00
5223891984
Update and clarify readme
...
Fixed typos. Made hyperlinks inline. Some editorial changes for
clarification. Updated and expanded introduction. Fixed a few
formatting errors.
2015-02-15 18:13:58 +11:00
16a1e41331
Set language to C++ in .travis.yml
2015-02-14 23:40:44 -05:00
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
739964cb25
Allow linter to fix some issues automatically
2015-02-14 22:25:10 -05:00
2c744035ab
lint: Avoid checking depends/ for now
2015-02-14 22:13:10 -05:00
7b29538485
Check for tabs and fix more line number issues
2015-02-14 22:07:57 -05:00
f91a5767cd
Fix line numbers
2015-02-14 21:43:10 -05:00
a19ca89e9f
Add .travis.yml
2015-02-14 20:10:48 -05:00
cf7b595965
Add python linter
2015-02-14 19:59:17 -05:00
49e53db063
Update NEWS
2015-02-13 18:35:20 -05:00
2d9197df50
Merge branch 'df2console' into develop
2015-02-13 17:59:16 -05:00
a8a8fc43ef
Add df2console() wrapper
...
Closes #522
2015-02-13 17:56:29 -05:00
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
lethosor
expwnent
Lethosor
Japa
PeridexisErrant