10293 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	6f03694d50	Fixes #1334: Only unequip item if the sell/drag action is actually successful	2014-05-19 08:03:55 +02:00
scrawl	510b7f8505	Task #1333: Remove cmake git tag reading	2014-05-19 07:31:19 +02:00
scrawl	0fe0dc33a6	Fixes #1338: Bring back a label that got lost	2014-05-19 05:35:16 +02:00
Marc Zinnschlag	7c149e98e0	Merge branch 'openmw-30'	2014-05-18 22:38:52 +02:00
Marc Zinnschlag	37f1a49352	Merge remote-tracking branch 'mrcheko/master'	2014-05-18 22:36:40 +02:00
mrcheko	fa14df62b7	fix crash on disappeared target	2014-05-18 23:15:22 +04:00
Marc Zinnschlag	a5f0fe7282	incremented version number	2014-05-18 20:07:41 +02:00
Marc Zinnschlag	1294682196	Merge remote-tracking branch 'scrawl/master'	2014-05-18 19:03:35 +02:00
scrawl	3dceb7ee4f	Fix overwriting DialInfo	2014-05-18 18:58:32 +02:00
Marc Zinnschlag	aa05acd26e	Merge remote-tracking branch 'scrawl/master'	2014-05-18 18:50:18 +02:00
Marc Zinnschlag	56c4367c1a	Merge remote-tracking branch 'mrcheko/master'	2014-05-18 18:42:23 +02:00
mrcheko	e1249f6a31	actor handle and id confusing fix	2014-05-18 20:13:46 +04:00
scrawl	a87b64d2da	Fix some ancient code	2014-05-18 16:34:58 +02:00
scrawl	0aa1042fd7	Optimized dialogue merging with a lookup map	2014-05-18 16:01:16 +02:00
scrawl	1677fcf324	Dialogue merging	2014-05-18 15:25:16 +02:00
mrcheko	66307dd889	travis fix #3 :(	2014-05-18 16:10:14 +04:00
mrcheko	74697f8116	travis fix #2	2014-05-18 15:41:15 +04:00
scrawl	5b76c0893a	Merge branch 'master' of https://github.com/OpenMW/openmw ... Conflicts: components/esm/inventorystate.hpp	2014-05-18 12:55:43 +02:00
greye	e02b04536f	fix most vexing parse issue	2014-05-18 14:55:05 +04:00
greye	424d06a6f8	open fstreams from boost::filesystem::path, vol.2	2014-05-18 14:55:05 +04:00
greye	2236216344	minor simplification	2014-05-18 14:55:05 +04:00
greye	a22ec223d8	open fstreams from boost::filesystem::path, vol.1	2014-05-18 14:55:05 +04:00
greye	18b3cfebdb	fix importer crash on empty lines (thanks to Ace)	2014-05-18 14:55:05 +04:00
greye	b4950509bc	use converted widechars in ini importer	2014-05-18 14:55:05 +04:00
greye	cd990a665a	create QString from utf-8 when expected	2014-05-18 14:55:05 +04:00
greye	eafdefe999	using WindowsPath implies utf-8 for boost fs::path	2014-05-18 14:55:05 +04:00
greye	584c121f33	fix windows unicode path handling	2014-05-18 14:55:04 +04:00
scrawl	a872c9f83a	Feature #1323: handle restocking levelled items	2014-05-18 12:53:21 +02:00
mrcheko	69c1eb28c5	travis compile fix	2014-05-18 14:39:04 +04:00
scrawl	90ec19c3ac	Remove unneeded MWScrollView	2014-05-18 10:30:03 +02:00
scrawl	150b920ef1	Fix long journal entries not being displayed	2014-05-18 10:14:03 +02:00
scrawl	5fc2b1a41b	Allow setting a journal index even if there's no related journal entry ... This is used by the MV_SlaveMule quest.	2014-05-18 07:39:16 +02:00
scrawl	e1458453f3	Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group ... Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts. Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.	2014-05-18 06:52:15 +02:00
cc9cii	12dc5cf4ea	Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.	2014-05-18 12:05:08 +10:00
cc9cii	b36bb58e8c	Bug #1324: Artem's solution	2014-05-18 07:34:13 +10:00
mrcheko	aa5647b45e	merge master, resolve conflicts	2014-05-17 19:20:57 +04:00
cc9cii	8971db8962	SceneWidget windowHandle fix for Windows.	2014-05-17 23:53:33 +10:00
scrawl	b4ed828e21	Feature #1323: Implement restocking items (does not handle levelled lists yet)	2014-05-17 14:30:31 +02:00
Marc Zinnschlag	f7c89015f9	Merge remote-tracking branch 'scrawl/master'	2014-05-17 11:50:31 +02:00
scrawl	ae66d28c87	Feature #32: Implement respawn for containers, creatures and NPCs	2014-05-17 09:09:00 +02:00
scrawl	92c5bb56e0	Un-reverted actorId for AiPursue	2014-05-17 05:34:54 +02:00
scrawl	e266aff561	Savegame: store projectiles	2014-05-17 05:24:32 +02:00
scrawl	15368188dc	Fix sliders in effect editor not being precisely movable	2014-05-17 02:54:51 +02:00
scrawl	9adb990143	Fix potentially unsafe use of MWWorld::Ptr	2014-05-17 02:52:24 +02:00
scrawl	e5a21aca53	Refactor projectiles to no longer use MW-objects	2014-05-16 13:33:30 +02:00
scrawl	18852c09d0	Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.	2014-05-16 12:28:23 +02:00
scrawl	36d9ae17cc	Revert "Change all AI packages (except AiActivate) to use ActorIds" ... Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..) This reverts commit 2e9985c1a3.	2014-05-16 12:11:34 +02:00
scrawl	028e00c98f	Add missing status report for some toggle commands	2014-05-16 09:21:28 +02:00
scrawl	868e38a07c	Fix Assault crimes being reported when striking in self-defense ... Last missing fix for Bug #1134.	2014-05-16 08:32:00 +02:00
scrawl	940a434479	Use ItemModel for moving items from a container to the world ... Fixes owner not resetting when moving an item from a corpse to the world.	2014-05-16 03:19:38 +02:00