Commit Graph

11271 Commits (a01114a41bbe6cb19edb88bcd566c32dbecd2f62)
 

Author SHA1 Message Date
lethosor 690cfb54a1 pr-check-base: Show more information about HTTP errors 2015-09-21 19:02:23 -04:00
expwnent e707e01221 travis: Try pip again. 2015-09-21 18:59:12 -04:00
lethosor 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
expwnent f80aa7fd2e travis: Try python-docutils package. 2015-09-21 18:50:21 -04:00
expwnent 5b85ea1314 Attempt to move to new travis infrastructure. 2015-09-21 18:38:11 -04:00
expwnent 0a4f55b7dd Merge pull request #691 from expwnent/vjek
Vjek scripts
2015-09-21 18:27:42 -04:00
expwnent cb0591f315 Fix indentation in Vjek scripts. 2015-09-21 18:25:16 -04:00
expwnent 93ce64a32c Merge remote-tracking branch 'peridexis/vjek-scripts' into vjek 2015-09-21 18:07:00 -04:00
expwnent b60a7fda43 Merge pull request #690 from expwnent/develop
Develop
2015-09-21 17:52:06 -04:00
expwnent b532a56790 Merge remote-tracking branch 'dfhack/develop' into develop 2015-09-21 17:48:34 -04:00
expwnent 0b06f2c719 Merge remote-tracking branch 'warmist/advfort' into develop 2015-09-21 17:47:16 -04:00
expwnent 47378d4b85 Merge branch 'luasocket' into develop 2015-09-21 17:46:47 -04:00
expwnent fabcfcd921 Fixed trailing whitespace. 2015-09-21 17:42:30 -04:00
expwnent 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
expwnent af90d14cb2 Use shenanigans to make a certain table const. 2015-09-21 17:24:51 -04:00
Warmist 7974945fb6 Whitespace fix. 2015-09-21 21:11:48 +03:00
Lethosor 827b364fba Merge pull request #685 from warmist/patch-4
Fix flag editing bug in gm-editor
2015-09-20 16:32:07 -04:00
Warmist 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
warmist 88d65b18a1 Fix bug in gm-editor
Fix a small bug that broken some flag editing.
2015-09-20 18:10:19 +03:00
lethosor 051a1f9661 Update xml 2015-09-19 18:00:59 -04:00
lethosor 7f575a8fd1 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-09-19 17:43:33 -04:00
lethosor 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
Warmist 1b924cdc79 Fixes to carving. Added unsafe checking. 2015-09-19 12:18:30 +03:00
Warmist e851543e1a Fix crash bug in advfort when failing almost constructed job. 2015-09-18 20:32:33 +03:00
Japa 129218d5f8 fix whitespace. 2015-09-16 23:29:21 +05:30
Japa ed07a8478b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-16 23:27:04 +05:30
Japa e49272854c Add basic army info to RemoteFortressReader.proto 2015-09-16 23:26:52 +05:30
Japa 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
Warmist 5c6a80037f Fix cooking allow using cooked meals as ingredient. 2015-09-16 14:05:29 +03:00
Warmist 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
expwnent 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
expwnent 7f7da945a6 Merge pull request #658 from warmist/patch-3
Create gm-unit.lua
2015-09-15 03:41:07 -04:00
expwnent 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
expwnent f9fce7e6a1 Convert tab to spaces in RemoteFortressReader.proto. 2015-09-15 03:21:09 -04:00
expwnent ab749ab0c8 Tweak create-unit and remove trailing whitespace. 2015-09-15 03:17:57 -04:00
expwnent 9107d2be52 Merge remote-tracking branch 'dfhack/develop' into create-unit 2015-09-15 03:11:54 -04:00
expwnent 8c361b784f Fix NEWS merge errors. 2015-09-15 03:09:32 -04:00
expwnent 301aca7f72 Update NEWS. 2015-09-15 02:48:28 -04:00
expwnent 5d40b4d274 Update NEWS. 2015-09-15 02:33:11 -04:00
expwnent fdca83e17a Tweak modtools/create-item (creator = \LAST) 2015-09-15 02:32:58 -04:00
expwnent 836fbe8650 Increment version of create-unit. 2015-09-15 02:20:23 -04:00
expwnent 6730e58bcf scripts/modtools/create-unit.lua: fix indentation and add todo list. 2015-09-15 02:19:31 -04:00
expwnent 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
expwnent ea74ec7132 Made "help" argument to scripts/modtools/create-unit.lua work correctly. 2015-09-15 01:07:31 -04:00
lethosor 2fcf751a44 Use DFHack fork of lethosor-scripts 2015-09-14 16:56:09 -04:00
lethosor d696832efa Merge branch '3rd-party-scripts' into develop 2015-09-14 16:52:13 -04:00
Warmist a1e0a30335 Advfort bug fixes and quickmode addition. 2015-09-14 18:55:13 +03:00
lethosor b58ccc9e55 Fix embark-tools title alignment 2015-09-12 20:28:42 -04:00
lethosor a852ca10d7 Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop 2015-09-12 19:59:53 -04:00
lethosor 9123f3cd3e gm-editor: Select enum items from a list by default
SEC_SELECT can be used for the old (numerical editing) behavior
2015-09-12 19:55:38 -04:00