lethosor
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
Japa
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
Japa
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
lethosor
57bdf731f0
Merge branch 'export-more-legends' into develop
2015-02-12 19:01:05 -05:00
lethosor
c39d3165eb
Use consistent indentation
2015-02-12 19:00:41 -05:00
PeridexisErrant
62bec962f8
Standard function definition syntax
2015-02-13 10:08:44 +11:00
Peridexis Errant
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
lethosor
3411704140
Merge remote-tracking branch 'Putnam3145/patch-12' into develop
...
Conflicts:
NEWS
2015-02-11 23:18:54 -05:00
Putnam3145
81b37f4f60
Update NEWS
2015-02-11 16:10:50 -08:00
Putnam3145
5da9b80421
Update NEWS
2015-02-11 16:09:22 -08:00
Putnam3145
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
PeridexisErrant
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
Lethosor
bb4c2e1838
Merge pull request #537 from lethosor/state-change-scripts
...
Additional state change scripts
2015-02-11 15:06:05 -05:00
lethosor
bb9d0666c4
Update NEWS
2015-02-11 15:05:10 -05:00
lethosor
56dfc66309
Implement map load/unload scripts and allow additional scripts to be registered
2015-02-11 15:03:47 -05:00
Lethosor
3793d87fba
Update NEWS
2015-02-11 14:59:21 -05:00
Lethosor
4c2354280c
Merge pull request #547 from lethosor/fix-lua-env-persistence
...
Fix lua environment persistence
2015-02-11 14:54:35 -05:00
lethosor
37f391ea6d
Don't store runScript() in script environments
2015-02-10 17:22:16 -05:00
lethosor
337598e0d6
Restore lua environment persistence and update modified timestamp correctly
...
See #544
2015-02-10 16:36:21 -05:00
lethosor
e3b67b2985
Use short plugin name in error messages when possible
2015-02-09 22:06:33 -05:00
lethosor
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
Lethosor
f287a99a37
Merge pull request #542 from scamtank/fix-armory
...
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
scamtank
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
scamtank
35d357776c
Substitute removed jobtypes with working ones
...
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
Lethosor
383baea8da
Merge pull request #541 from BenLubar/fix-show-unit-syndromes
...
Fix show-unit-syndromes (part 2)
2015-02-08 15:48:40 -05:00
Ben Lubar
ea74e1252a
fix attribute-changing syndromes in show-unit-syndromes
2015-02-08 13:55:39 -06:00
lethosor
d1d313b7ba
Update NEWS
2015-02-08 09:45:10 -05:00
lethosor
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -05:00
lethosor
15d3b7831f
hide/show: Provide feedback on unsupported platforms
2015-02-08 09:30:40 -05:00
lethosor
a1691b6777
Merge remote-tracking branch 'warmist/console-hide' into develop
...
Conflicts:
library/Console-darwin.cpp
2015-02-08 09:20:05 -05:00
Lethosor
820a7666c3
Remove outdated version information from Readme.rst
2015-02-07 19:49:26 -05:00
Lethosor
83380fa567
Merge pull request #536 from miffedmap/allow_rc_preload
...
avoid dangling colon
2015-02-07 16:32:18 -05:00
miffedmap
ca6646e963
avoid dangling colon
2015-02-07 23:26:10 +02:00
Lethosor
a32bc2ff21
Merge pull request #535 from miffedmap/allow_rc_preload
...
LD_PRELOAD should use colon rather then space as delimiter
2015-02-07 15:45:35 -05:00
miffedmap
df9633c827
LD_PRELOAD should use colon rather then space as delimiter
2015-02-07 22:27:38 +02:00
lethosor
54bd347b3d
Update NEWS
2015-02-06 19:22:08 -05:00
lethosor
24cc1b25a3
Merge branch 'lethosor/zone-cage-owner-scroll-crash' into develop
2015-02-06 19:18:02 -05:00
lethosor
50770f8cdd
Clean up whitespace in zone.cpp
2015-02-06 19:13:34 -05:00
lethosor
00072dae1d
Fix crash in zone plugin from scrolling when assigning an owner to a cage
...
Fixes #534
2015-02-06 19:12:10 -05:00
lethosor
7823a14a8f
Merge remote-tracking branch 'Putnam3145/patch-10' into develop
...
Conflicts:
NEWS
2015-02-06 17:08:00 -05:00
Lethosor
8bc9bcfcb1
Merge pull request #533 from Putnam3145/patch-11
...
Added subthought properly to add-thought.
2015-02-06 16:58:40 -05:00
Putnam3145
0baf0603ad
Update NEWS
2015-02-06 13:53:55 -08:00
Putnam3145
ac318aaee8
Added subthought properly to add-thought.
...
Not used much, but still very much a problem that it wasn't there.
2015-02-06 13:52:56 -08:00
Lethosor
7ad44fcea8
Clarify that the perl libraries are required on Linux
2015-02-05 21:24:19 -05:00
Lethosor
b9910490bf
digcircle documentation: radius -> diameter
...
Fixes #523
2015-02-05 15:33:33 -05:00
Putnam3145
2b438a2970
Update NEWS
2015-02-05 00:26:33 -08:00
Putnam3145
674b9dd5a9
Made hack-wish stack properly.
2015-02-05 00:25:05 -08:00
Lethosor
bcfff161e7
Rename ShowUnitSyndromes.rb to show-unit-syndromes.rb
2015-02-03 21:25:43 -05:00
Lethosor
51b7b1adba
Merge pull request #528 from BenLubar/fix-showunitsyndromes
...
fix ShowUnitSyndromes
2015-02-03 21:23:33 -05:00
Ben Lubar
02a14c6b57
fix ShowUnitSyndromes
2015-02-03 20:05:33 -06:00