Commit Graph

7224 Commits (e357d9e40b5ea62d0ee1bdd960bdcbc18d6d6c6e)
 

Author SHA1 Message Date
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
expwnent e3a12baaa6 Update create-unit so that civ -1 creatures are not histfigs and mitigated screen-movement bug. See http://www.bay12forums.com/smf/index.php?topic=139553.msg6845001#msg6845001 2016-03-02 00:40:34 -05:00
lethosor 5334bd8a6a Bump version to 0.42.06-alpha0 and update xml 2016-02-28 11:18:27 -05:00
lethosor 95e7553a99 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-02-28 11:15:46 -05:00
lethosor aac54c3c22 Add generate-MSVC-release.bat (with devel/dev_plugins disabled) 2016-02-28 11:15:30 -05:00
Japa a5494f74a0 Added world pole direction to RemoteFortressReader.proto 2016-02-28 21:26:15 +05:30
Lethosor fe878b3998 Merge pull request #829 from sv-esk/export_dt_ini
merge export-dt-ini script changes from splintermind/Dwarf-Therapist
2016-02-27 19:31:44 +01:00
sv-esk 0614d0cf57 merge export-dt-ini script changes from splintermind/Dwarf-Therapist 2016-02-27 17:09:19 +02:00
lethosor 5bb19a230f getKillCount: also search kills->events 2016-02-25 15:34:56 -05:00
lethosor 25507a10f9 Add Units::getKillCount() and expose it to Lua 2016-02-25 15:21:14 -05:00
lethosor 3e44aabf12 Expose Units::getSquadName to lua 2016-02-25 15:19:35 -05:00
lethosor 297bbd6f20 Merge remote-tracking branch 'warmist/develop' into develop (closes #772) 2016-02-24 17:24:03 -05:00
lethosor 78a7d7a43b Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop 2016-02-24 16:36:57 -05:00
lethosor 9d0d4fd08b Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-02-24 16:34:29 -05:00
lethosor 79fde493e2 Merge remote-tracking branch 'eswald/autogems-bugfix' into develop 2016-02-24 16:33:54 -05:00
Lethosor d479f30592 Merge pull request #826 from eswald/stockflow-4206
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
Eric Wald 8ce115646a Updating Stockflow for version 42.06
The manager can now specify each type of craft individually, as well as in general.
There may be a better justification for not allowing pearl and shell scepters, though.
2016-02-23 22:09:26 -07:00
lethosor 6a9205eccc save-version: add 0.42.06 (1542) 2016-02-23 19:50:15 -05:00
sv-esk 20572fb667 add new jobs to autolabor 2016-02-23 19:01:14 +02:00
expwnent d1073a35d6 modtools/create-unit: checked for args.civId ~= -1 2016-02-20 19:00:47 -05:00
Japa 420eb5341b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-20 01:31:12 +05:30
Japa ac068b4738 Fixed DF color translation in remotefortressreader.cpp 2016-02-20 01:30:56 +05:30
Eric Wald 224d29de88 Reversing o-W-g autogems default setting
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
2016-02-13 21:01:26 -07:00
Eric Wald e160fec2b9 Ignoring forbidden rough gems 2016-02-13 20:59:08 -07:00
sv-esk d2450c34ff forbid manipulator editing ghosts
they are not flags1.dead
2016-02-12 13:47:58 +02:00
lethosor f4ce45deae Disable confirm note-delete in name entry
Fixes #820
2016-02-11 22:56:33 -05:00