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
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
57bdf731f0
Merge branch 'export-more-legends' into develop
2015-02-12 19:01:05 -05:00
c39d3165eb
Use consistent indentation
2015-02-12 19:00:41 -05:00
62bec962f8
Standard function definition syntax
2015-02-13 10:08:44 +11:00
74476bcd95
fix whitespace
...
PSA: do not assume that it's the same as last time you checked.
2015-02-12 16:14:25 +11:00
3411704140
Merge remote-tracking branch 'Putnam3145/patch-12' into develop
...
Conflicts:
NEWS
2015-02-11 23:18:54 -05:00
81b37f4f60
Update NEWS
2015-02-11 16:10:50 -08:00
5da9b80421
Update NEWS
2015-02-11 16:09:22 -08:00
38fbf67262
Make skill-change actually work with level
...
It was trying to set the level to the string "Proficient" instead of 5, same for every other skill level. There was no workaround, especially since it expected numbers for the value.
2015-02-11 16:08:23 -08:00
f67370b817
exportlegends - more data in legends_plus.xml
...
Originally written by Mason11987, adapted and included with permission.
2015-02-12 09:39:56 +11:00
bb4c2e1838
Merge pull request #537 from lethosor/state-change-scripts
...
Additional state change scripts
2015-02-11 15:06:05 -05:00
bb9d0666c4
Update NEWS
2015-02-11 15:05:10 -05:00
56dfc66309
Implement map load/unload scripts and allow additional scripts to be registered
2015-02-11 15:03:47 -05:00
3793d87fba
Update NEWS
2015-02-11 14:59:21 -05:00
4c2354280c
Merge pull request #547 from lethosor/fix-lua-env-persistence
...
Fix lua environment persistence
2015-02-11 14:54:35 -05:00
lethosor
Japa
Lethosor
Peridexis Errant
Putnam3145