60ed4a1a50
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-09-21 19:25:58 -04:00
62c903b7be
search: Fix crash when disabling a stockpile category
...
Closes #678
2015-09-21 19:25:20 -04:00
3a75d9c87f
Merge pull request #692 from expwnent/travis
...
Move to new travis infrastructure.
2015-09-21 19:09:53 -04:00
8c4fb7668d
Merge remote-tracking branch 'dfhack/develop' into travis
2015-09-21 19:04:31 -04:00
690cfb54a1
pr-check-base: Show more information about HTTP errors
2015-09-21 19:02:23 -04:00
e707e01221
travis: Try pip again.
2015-09-21 18:59:12 -04:00
91a1836439
Fix a few issues with init file variations
...
* GCC does not allow std::string instances or enums without a base
type to be passed as varargs
* Fixed path concatenation issue causing dfhack.init to not be loaded
2015-09-21 18:57:58 -04:00
f80aa7fd2e
travis: Try python-docutils package.
2015-09-21 18:50:21 -04:00
5b85ea1314
Attempt to move to new travis infrastructure.
2015-09-21 18:38:11 -04:00
0a4f55b7dd
Merge pull request #691 from expwnent/vjek
...
Vjek scripts
2015-09-21 18:27:42 -04:00
cb0591f315
Fix indentation in Vjek scripts.
2015-09-21 18:25:16 -04:00
93ce64a32c
Merge remote-tracking branch 'peridexis/vjek-scripts' into vjek
2015-09-21 18:07:00 -04:00
b60a7fda43
Merge pull request #690 from expwnent/develop
...
Develop
2015-09-21 17:52:06 -04:00
b532a56790
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-21 17:48:34 -04:00
0b06f2c719
Merge remote-tracking branch 'warmist/advfort' into develop
2015-09-21 17:47:16 -04:00
47378d4b85
Merge branch 'luasocket' into develop
2015-09-21 17:46:47 -04:00
fabcfcd921
Fixed trailing whitespace.
2015-09-21 17:42:30 -04:00
2c9b268184
Merge pull request #689 from expwnent/develop
...
Generalize dfhack.init so it looks for more files in more places, for onload, onunload, etc.
2015-09-21 17:33:52 -04:00
af90d14cb2
Use shenanigans to make a certain table const.
2015-09-21 17:24:51 -04:00
7974945fb6
Whitespace fix.
2015-09-21 21:11:48 +03:00
827b364fba
Merge pull request #685 from warmist/patch-4
...
Fix flag editing bug in gm-editor
2015-09-20 16:32:07 -04:00
3cd4b90db8
Fixes and minecart improvements
...
added output to clear_jobs of number of cleared jobs
another failed attempt at gather plants fix
added track stop configuration window
2015-09-20 20:46:13 +03:00
88d65b18a1
Fix bug in gm-editor
...
Fix a small bug that broken some flag editing.
2015-09-20 18:10:19 +03:00
051a1f9661
Update xml
2015-09-19 18:00:59 -04:00
7f575a8fd1
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-09-19 17:43:33 -04:00
a56a427d12
Make Filesystem::is* functions handle nonexistent paths properly
...
If stat() failed, these functions could read from an uninitialized
stat struct and return "true" for paths that didn't exist.
2015-09-19 17:34:58 -04:00
1b924cdc79
Fixes to carving. Added unsafe checking.
2015-09-19 12:18:30 +03:00
e851543e1a
Fix crash bug in advfort when failing almost constructed job.
2015-09-18 20:32:33 +03:00
129218d5f8
fix whitespace.
2015-09-16 23:29:21 +05:30
ed07a8478b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-16 23:27:04 +05:30
e49272854c
Add basic army info to RemoteFortressReader.proto
2015-09-16 23:26:52 +05:30
5ce6fceacc
Send the center with the world map, based off current embark if available, otherwise adventurer position.
2015-09-16 23:25:23 +05:30
5c6a80037f
Fix cooking allow using cooked meals as ingredient.
2015-09-16 14:05:29 +03:00
80fd4b1365
Some additions and fixes.
...
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
5bf3093139
Now it looks for dfhack*.init instead of just dfhack.init, onLoad*.init instead of just onLoad.init, etc.
2015-09-15 07:27:42 -04:00
7f7da945a6
Merge pull request #658 from warmist/patch-3
...
Create gm-unit.lua
2015-09-15 03:41:07 -04:00
48d80cfb1a
Merge pull request #684 from expwnent/create-unit
...
create-unit script, fix tab in RemoteFortressReader.proto, create-item tweak, equip-item script.
2015-09-15 03:24:26 -04:00
f9fce7e6a1
Convert tab to spaces in RemoteFortressReader.proto.
2015-09-15 03:21:09 -04:00
ab749ab0c8
Tweak create-unit and remove trailing whitespace.
2015-09-15 03:17:57 -04:00
9107d2be52
Merge remote-tracking branch 'dfhack/develop' into create-unit
2015-09-15 03:11:54 -04:00
8c361b784f
Fix NEWS merge errors.
2015-09-15 03:09:32 -04:00
301aca7f72
Update NEWS.
2015-09-15 02:48:28 -04:00
5d40b4d274
Update NEWS.
2015-09-15 02:33:11 -04:00
fdca83e17a
Tweak modtools/create-item (creator = \LAST)
2015-09-15 02:32:58 -04:00
836fbe8650
Increment version of create-unit.
2015-09-15 02:20:23 -04:00
6730e58bcf
scripts/modtools/create-unit.lua: fix indentation and add todo list.
2015-09-15 02:19:31 -04:00
d4300ab814
scripts/modtools/create-unit.lua: now you can set the age (in years) of newly-created units.
2015-09-15 01:36:29 -04:00
ea74ec7132
Made "help" argument to scripts/modtools/create-unit.lua work correctly.
2015-09-15 01:07:31 -04:00
2fcf751a44
Use DFHack fork of lethosor-scripts
2015-09-14 16:56:09 -04:00
d696832efa
Merge branch '3rd-party-scripts' into develop
2015-09-14 16:52:13 -04:00
lethosor
expwnent
Warmist
Lethosor
Japa