Commit Graph

7349 Commits (7487f44fc8cb801cbf6d283833e7eed7f115dfdf)
 

Author SHA1 Message Date
lethosor e467c2010a Merge remote-tracking branches 'Putnam3145/patch-24' and 'BenLubar/rfr-follow' into develop 2016-03-18 16:37:37 -04:00
Putnam3145 de899c5966 DF measures density in kg/m^3
https://www.reddit.com/r/dwarffortress/comments/4aq6wp/thats_1520000_kgm3/
2016-03-16 21:55:19 -07:00
lethosor d2a8495a42 extra-gamelog: Fix season messages, error when loading spring saves
e0346ede56, #754
2016-03-14 20:58:44 -04:00
Ben Lubar 197e163a42 add follow_unit_id and follow_item_id to RemoteFortressReader 2016-03-14 13:54:46 -05:00
lethosor 76793045a9 Only block keyboard events in OS X SDL_PollEvent hook without focus
Blocking all events causes issues with window manager controls when the window
is not focused - for example, DF doesn't resize certain screen buffers, leading
to flickering in OpenGL print modes.
2016-03-13 10:33:25 -04:00
Japa 2f86683d37 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-13 18:31:52 +05:30
Japa 2fc784f825 Add world pole orientation to remotefortressreader.cpp. 2016-03-13 18:31:27 +05:30
expwnent 5bb98295b3 Merge pull request #810 from PeridexisErrant/colonies
Colonies as a script, + place feature by Warmist
2016-03-13 08:32:05 -04:00
expwnent b24cbe6f84 Merge pull request #803 from robertjanetzko/additional-exports
Additional exports (masterpiece events, occasions and schedules)
2016-03-13 08:29:57 -04:00
expwnent 0a2cb08dba Merge pull request #754 from PeridexisErrant/better-gamelog
Merge gamelog scripts to modtools/extra-gamelog
2016-03-13 08:27:11 -04:00
expwnent b71c1b9e7c Merge pull request #751 from PeridexisErrant/remove-dfusion
Remove dfusion, df2mc, mapexport, dwarfexport
2016-03-13 08:22:07 -04:00
expwnent c4528d4e0e Merge pull request #866 from warmist/building_hacks_update
Add auto-gears mode for building hacks
2016-03-13 07:45:17 -04:00
Warmist eb621d6819 Update NEWS.rst 2016-03-13 13:38:26 +02:00
Warmist bc02e2a844 Add auto-gears mode for building hacks for automatic animation and gear positions. 2016-03-13 13:37:36 +02:00
expwnent 91235ff806 Merge pull request #867 from warmist/eventful-change
Change eventful to have sane(r) callback for produce
2016-03-13 07:34:17 -04:00
Warmist 45643ef2e3 Update NEWS.rst 2016-03-13 13:25:10 +02:00
Warmist 5895621eec Change eventful to have sane(r) callback for produce 2016-03-13 12:57:36 +02:00
Japa 4a5971966a Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-12 21:53:17 +05:30
expwnent 6fd904fd9e Bump version, tweak whitespace. 2016-03-10 09:16:03 -05:00
expwnent fe6bb1fe58 Update NEWS. 2016-03-10 09:04:08 -05:00
expwnent 5ae3e350dd Merge pull request #839 from sv-esk/teledwarf
fix teledwarf bug (leaves babies lying on ground)
2016-03-10 08:58:48 -05:00
expwnent 5fe618ade5 Merge pull request #840 from expwnent/develop
Fix persistent histfig crashbug.
2016-03-10 08:58:08 -05:00
expwnent f8ff447cb5 Add a check to the histfig fix and tweak NEWS. 2016-03-10 08:50:03 -05:00
expwnent fd132d3fe7 Fix persistent histfig crashbug. 2016-03-10 08:38:55 -05:00
sv-esk 6ab8c8b9b1 fix teledwarf bug (leaves babies lying on ground) 2016-03-10 13:54:38 +02:00
lethosor cbb4275a44 Update xml 2016-03-09 14:54:24 -05:00
lethosor 75fb1253b2 Merge remote-tracking branch 'sv-esk/custom_methods' into develop 2016-03-09 14:49:54 -05:00
sv-esk dd9f1bf759 make world friend of machine and building handlers to allow use their
protected constructor
2016-03-09 13:03:16 +02:00
Japa 5ec03774b5 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-05 17:30:54 +05:30
lethosor b8ca4b5acc Bump version to alpha1 2016-03-04 20:38:25 -05:00
lethosor b8bba97642 Add confirm entry to NEWS.rst
See f4ce45d
2016-03-04 20:34:46 -05:00
lethosor fbdcdc6f7c Fix NEWS.rst 2016-03-04 20:28:42 -05:00
lethosor c700847bcf Remove a couple unneeded includes 2016-03-04 20:23:00 -05:00
lethosor c595f7908a Update xml 2016-03-04 20:22:09 -05:00
lethosor 5a229a2dd3 Update NEWS.rst 2016-03-04 20:18:59 -05:00
lethosor 3c6f474588 Add some useful built-in variables to the lua interpreter environment 2016-03-04 20:18:08 -05:00
lethosor b6f1650a01 Merge remote-tracking branches 'sv-esk/iscitizen' and 'sv-esk/validation' into develop 2016-03-04 19:09:26 -05:00
lethosor f3f719a25c Fix duplicate call to df2console 2016-03-04 19:08:57 -05:00
lethosor 4b07a6001e gaydar: handle soul-less creatures and fix spacing 2016-03-04 17:54:32 -05:00
lethosor 12044852cc gaydar: fix console encoding 2016-03-04 17:41:06 -05:00
sv-esk 9da79544de fix Units::isCitizen
fixes a lot of issues where plugins ignore non-dwarf citizens and work
with dwarf mercenaries and bards, where it shouldnot
2016-03-04 22:48:33 +02:00
sv-esk 3dee6a87cf modify modtools/force.lua
avoid segfault in case of invalid or abscent cv argument
remove CivAttack. It was broken in 40.0X
2016-03-04 20:28:12 +02:00
lethosor 8eb39cc1d0 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-03-03 23:19:03 -05:00
lethosor 0db3c72557 Update xml 2016-03-03 23:18:36 -05:00
Lethosor 4fd9506989 Merge pull request #832 from sv-esk/job
fix job-duplicate bug (ignoring cloned jobs with posting_index)
2016-03-03 15:55:06 -05:00
sv-esk d508028bcc fix job-duplicate (do not clone posting_index)
if job cannot be done right now, game puts it in df.global.world.job_postings
when job finally can be done, game removes job from postings and clears posting_index
that index should not be cloned by job-duplicate(new jobs(added by vanilla way) have that value -1 always anyway)
cloning posting_index into the new job causes that job to be ignored
2016-03-03 21:32:16 +02:00
Lethosor 5e2fc56621 Merge pull request #831 from sv-esk/manipulator
Fix minor manipulator bug
2016-03-02 18:40:32 -05:00
sv-esk 198571dca3 fix manipulator bug (unable to apply last custom profession)
"selected" starts with 1, not 0
2016-03-03 01:24:18 +02:00
expwnent 1fd1169a48 Merge pull request #830 from expwnent/develop
Update create-unit so that civ -1 creatures are not histfigs and miti…
2016-03-02 04:52:05 -05:00
expwnent 5a7c667c89 Remove trailing whitespace. 2016-03-02 04:39:59 -05:00