Commit Graph

9006 Commits (6b828115a74d2cf715388c01e9014ae19adaec0f)
 

Author SHA1 Message Date
lethosor 8b8b58faef Update NEWS.rst and Authors.rst 2016-05-09 21:03:12 -04:00
lethosor d93cbd709e Merge remote-tracking branches 'warmist/fixpositions', 'warmist/gm_editor_changes', 'rubybrowncoat/feature/fix-multiquality-gui-create-item' and 'AtomicChicken/item-trigger-fix' into develop 2016-05-09 20:55:14 -04:00
Warmist c283e85fd5 Fix whitespace 2016-05-08 12:10:36 +03:00
Warmist dde7d151b7 Fix few bugs with fix/diplomats.lua and fix/merchants.lua 2016-05-08 09:39:28 +03:00
Lethosor e40838805a Merge pull request #915 from warmist/warmist-patch-1
Fix gui/mod-manager
2016-05-05 07:41:08 -04:00
Warmist 88d1a79c0c Fix gui/mod-manager
it fails if mods folder does not exist
2016-05-05 13:47:29 +03:00
Japa 46d93b1d7f Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-05-02 20:59:07 +05:30
Japa 56f2603097 Send over rivers through remotefortressreader.cpp 2016-05-02 20:58:36 +05:30
Matsor Browncoat ce3c9d06a0 Fixed quality in gui/create-item with -multi.
When -multi option is selected, gui/create-item doesn't set quality neither on stackable nor unstackable items. Fixed this quirk.

No refactoring or optimizations. Just moved a variable and added code inside the createItem function.
2016-05-01 19:50:03 +02:00
Warmist a5a61ce6b0 I think i got the perfect message now. 2016-04-30 23:06:38 +03:00
Warmist 523638a899 Add news entry 2016-04-30 22:13:38 +03:00
Warmist 3ee829f05b Allow to insert ints and other simple types. Also allow inserting of same base type as the container.
Also simplify it a bit.
2016-04-30 22:10:01 +03:00
lethosor 208eb6f452 update news 2016-04-30 15:04:01 -04:00
lethosor 71654aff05 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-04-30 15:01:12 -04:00
lethosor 6f5e1260e3 exportlegends: wrap enum lookups to avoid errors or writing "nil" to xml files
Any unidentified enum items should now be represented as "unknown X"

Fixes an issue with occasion_schedule_type 8, and probably many others
2016-04-30 14:59:04 -04:00
Japa b8f5496b24 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-25 22:39:18 +05:30
Japa 572d38e3db Made remotefortressreader.cpp return the correct area of interest in the world when on the embark screen. 2016-04-25 22:38:47 +05:30
lethosor 9d706854bc Add r1 NEWS.rst section header 2016-04-24 17:36:32 -04:00
lethosor caa1b9f355 Update NEWS.rst
Ref #804, #812
2016-04-24 17:12:13 -04:00
lethosor 24fd47c030 Bump to r1 in CMakeLists.txt 2016-04-23 22:02:39 -04:00
lethosor 402a96b0e6 Expose new unit functions to lua and add some basic safety checks 2016-04-23 21:52:50 -04:00
lethosor f66dd77a72 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-04-23 20:33:25 -04:00
lethosor bc7c689d93 update xml 2016-04-23 20:33:03 -04:00
lethosor 5418233117 to_string -> int_to_string 2016-04-22 20:27:53 -04:00
lethosor fd54003384 More make_pair replacements 2016-04-22 20:26:07 -04:00
lethosor ec42967996 Use std::make_pair instead of initializer lists 2016-04-22 19:43:05 -04:00
lethosor 8784a133e8 Initialize maps in a MSVC 2010-compatible way 2016-04-22 18:45:32 -04:00
lethosor 52728babd4 Merge branch 'develop' into zone-unassign 2016-04-22 18:41:15 -04:00
AtomicChicken 68267d2ab3 Update item-trigger.lua
whitespace removed
2016-04-20 12:05:48 +02:00
AtomicChicken 0d8a80c2ec Update item-trigger.lua
added proper indentation
2016-04-20 11:08:49 +02:00
PeridexisErrant acac839371 Replace fixdiplomats, fixmerchants with scripts 2016-04-20 11:12:06 +10:00
AtomicChicken 9319ebfba0 Update item-trigger.lua
Fixed an error caused by item-trigger attempting to handle item types which lack a subtype, whilst simultaneously adding support for such items.
2016-04-19 15:47:05 +02:00
Japa 856c3b06f4 Added dig designations to remotefortressreader.cpp 2016-04-19 19:15:33 +05:30
Japa 1317792cde Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-19 18:17:39 +05:30
Lethosor 50f2851772 Merge pull request #742 from PeridexisErrant/ls-cleanup
Ls cleanup
2016-04-17 17:59:22 -04:00
lethosor 9f95293e3e Add df.type.find() dialog to gm-editor 2016-04-17 16:41:46 -04:00
lethosor b36193857c Add string:startswith(), endswith() 2016-04-16 17:13:41 -04:00
lethosor 8226134f67 Make can_trade() return true if at least one caravan can trade
Fixes #900
2016-04-16 17:13:00 -04:00
PeridexisErrant 205e5cd371 Un-break script doc checker
This handles any number of empty lines above the title, including zero -
a harmless case which was breaking the build.
2016-04-15 16:51:24 +10:00
PeridexisErrant eb34ff0cd6 Fix typos and missing links in docs 2016-04-15 16:28:41 +10:00
PeridexisErrant ae81454786 Minor fixes, space no longer required
Thanks to 2882422
2016-04-15 16:28:41 +10:00
PeridexisErrant 273c22f606 Shorten "ls" help for plugins
I think that's all of them.
2016-04-15 16:28:41 +10:00
PeridexisErrant 403e9f60b2 More informative "ls" messages
Because printing the name of the script doesn't help; it's already on
the left!
2016-04-15 16:28:41 +10:00
PeridexisErrant fc9e2fbff7 Shorten wrapped "ls" descriptions in scripts 2016-04-15 16:28:41 +10:00
PeridexisErrant feff83cedc Require a short help string for "ls"
The linter change will enforce it for scripts.  Plugins always include
the line, and length will have to be checked manually.
2016-04-15 16:28:41 +10:00
lethosor 0d37209063 use trade_state enum 2016-04-13 09:44:57 -04:00
lethosor 3ab963499a Bump to beta1 2016-04-12 21:30:25 -04:00
lethosor 7fe142ea76 add many missing section anchors to Plugins.rst 2016-04-12 20:09:41 -04:00
lethosor e7fba67a72 run sphinx-build in parallel 2016-04-12 20:09:27 -04:00
lethosor a92b67c80d Add ability to edit min/max logs and remove cap
Closes #893
2016-04-12 19:52:51 -04:00