Commit Graph

10834 Commits (cd61b47c7930e6f7de1b7c4e914ce996d0e4e3d0)
 

Author SHA1 Message Date
lethosor 3ca00f85d0 Merge remote-tracking branch 'lethosor/json' into develop 2015-04-08 20:18:13 -04:00
lethosor 62cfd0b8ca Reset DYLD_INSERT_LIBRARIES on startup on OS X
This prevents subprocesses (e.g. those launched with Lua's os.execute)
from attempting to load libdfhack.dylib and aborting due to an
architecture mismatch.
2015-04-06 17:05:36 -04:00
lethosor fab7887f20 Make lint.py work under Python 3 and fix a few UTF-8 errors 2015-04-06 11:25:30 -04:00
Peridexis Errant 2bd5b7e349 Describe blocks, fix trailing whitespace 2015-04-06 16:03:14 +10:00
lethosor 4b124bc022 Avoid including DFHackVersion.h in PluginManager.h
Changes to DFHackVersion.h previously required recompiling nearly all
of the DFHack core.
2015-04-03 14:02:14 -04:00
lethosor 6187ac3054 Only initialize steam-engine when a fortress mode map is loaded
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.

Fixes #444
2015-04-02 17:17:29 -04:00
lethosor 7758311f88 Make gametype functions use default arguments when called from Lua 2015-04-02 16:55:27 -04:00
lethosor 786581689f Move get_dfhack_version() to a separate namespace and add a few other version-related functions 2015-04-02 16:37:58 -04:00
lethosor 9b6d8d2799 Allow dev plugins to be skipped on startup 2015-04-01 17:50:22 -04:00
lethosor 8b5b8ed864 Log command name collisions 2015-04-01 17:32:11 -04:00
lethosor 82d72007fc Move zoom-related commands to a separate dev plugin 2015-04-01 17:24:52 -04:00
lethosor 7913517b2c Add "nyan stop" command 2015-04-01 17:02:33 -04:00
PeridexisErrant ad09bc98d1 Add script, content, and documentation
See readme diff for more information.  A follow-up pull will eventually
come to complete the description coverage.
2015-04-01 10:23:09 +11:00
lethosor 8a0240e713 Document dfhack.penarray 2015-03-31 16:46:46 -04:00
Lethosor e71c55865d Merge pull request #591 from lethosor/penarray
Expose a faster screen drawing/caching API to Lua
2015-03-31 16:11:28 -04:00
lethosor 331be2b589 Make "keybinding list" accept a context
See #588
2015-03-30 19:03:16 -04:00
expwnent 0849099f20 Fix contributing merge errors. 2015-03-30 12:44:57 -04:00
expwnent f9b431b54d Version bump and update NEWS. 2015-03-30 12:38:56 -04:00
expwnent be75883ac5 Update HTML. 2015-03-30 12:27:00 -04:00
expwnent 6779849bc6 This requires a return value in Windows, and really should have one anyway. 2015-03-29 14:21:59 -04:00
lethosor bbb41078e7 Expose PenArray dimensions and tiles to Lua 2015-03-28 18:35:07 -04:00
Lethosor b8f621f72d Merge pull request #590 from BenLubar/ban-cooking
ban-cooking script
2015-03-28 16:00:29 -04:00
Ben Lubar e657a05ca1 ban-cooking script
ban-cooking booze  - bans cooking of drinks
ban-cooking honey  - bans cooking of honey bee honey
ban-cooking tallow - bans cooking of tallow
ban-cooking oil    - bans cooking of oil
ban-cooking seeds  - bans cooking of plants that have seeds (tree seeds
don't count)
2015-03-28 13:09:35 -05:00
lethosor e2b6ae9beb Allocate Lua PenArray objects using an existing buffer 2015-03-28 11:27:47 -04:00
lethosor 99f4ea4d2b Implement a PenArray class for caching parts of rendered screens 2015-03-27 22:56:30 -04:00
lethosor ac2f537bf4 Merge branch 'async-zoom' into develop 2015-03-26 19:41:02 -04:00
Lethosor 88c3a629d5 Fix vshook 2015-03-26 19:27:22 -04:00
Lethosor ee16c6d1ab Fix "delete" in console on OS X/Linux 2015-03-25 23:31:23 -04:00
lethosor 7f98a632ce Update xml 2015-03-25 17:58:00 -04:00
lethosor 01c6d05775 Add custom enabler::zoom_display() method (screen.zoom in Lua) 2015-03-25 17:55:56 -04:00
lethosor 42e4f584b9 Add SDL_SemWait and SDL_SemPost hooks 2015-03-25 16:08:25 -04:00
Lethosor e8ff7ff97a Merge pull request #586 from jlogsdon/fix/manipulator-enum-key
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:24:53 -04:00
James Logsdon f8d8baef39 Remove explicit tokens and use ENUM_KEY_STR for profession templates 2015-03-25 15:04:52 -04:00
Lethosor b94dd447cf Merge pull request #585 from BenLubar/fix/stockpiles-directory
plugins/stockpiles: only create the stocksettings directory when it is requested
2015-03-24 21:15:21 -04:00
Ben Lubar d182b6c1c3 only create the stocksettings directory when it is requested 2015-03-24 17:46:49 -05:00
lethosor 5c877e4012 Clarify trailing whitespace logic 2015-03-24 16:08:33 -04:00
lethosor a5b2b92b30 Merge remote-tracking branch 'eswald/stockflow' into develop 2015-03-24 16:05:48 -04:00
lethosor ff38a60d56 Merge remote-tracking branch 'lethosor/ui-tweaks' into develop 2015-03-24 15:53:36 -04:00
expwnent 4fac0aff0d Fix compile: missing include in plugins/manipulator.cpp. 2015-03-24 12:25:50 -04:00
expwnent eeb73462e5 Merge branch 'fix/manipulator-professions' of https://github.com/jlogsdon/dfhack into jlogsdon-fix/manipulator-professions 2015-03-24 07:39:07 -04:00
expwnent c8495a0a35 Merge pull request #582 from scamtank/patch-1
Extend fix/blood-del to include tears and sweat
2015-03-24 07:28:23 -04:00
Eric Wald ebb3dc48bf Allowing whitespace-only lines. 2015-03-22 20:46:46 -06:00
Lethosor bf95e14358 Update NEWS 2015-03-22 16:43:44 -04:00
Lethosor 874e8d3104 Update NEWS 2015-03-22 16:39:15 -04:00
lethosor fb7837db0e Merge branch 'osx-libstdc++-10.5' into develop 2015-03-22 15:03:14 -04:00
lethosor 02cb510d20 Build OS X libstdc++ with -mmacosx-version-min=10.5
Fixes #561
2015-03-22 15:01:13 -04:00
lethosor 38fa416ad1 Lua: Indent array values 2015-03-22 14:04:03 -04:00
scamtank 9a661e1481 Extend fix/blood-del to include tears and sweat
This version of blood-del.lua will catch the new bodily emissions too, mostly from gremlins or gnomes.
2015-03-22 14:24:51 +02:00
Eric Wald 4f963233f4 Enticing the bookkeeper to work more often 2015-03-20 19:23:04 -06:00
lethosor d382d94cbc Use git:// url in .gitmodules 2015-03-20 20:26:24 -04:00