8109 commits

Author	SHA1	Message	Date
scrawl	7f66339790	Remove a redundant function	2015-07-24 20:23:27 +02:00
scrawl	71bc22401f	Include cleanup	2015-07-24 18:23:23 +02:00
scrawl	7e4e59efb9	Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792)	2015-07-23 02:29:09 +02:00
scrawl	7900631d51	Print the missing player cell to error output	2015-07-23 02:29:09 +02:00
scrawl	8286dc6c5a	Player followers don't report crimes (Fixes #2457)	2015-07-23 02:29:09 +02:00
Marc Zinnschlag	6e3032efc1	Merge remote-tracking branch 'koncord/fix-gold-beh'	2015-07-22 08:30:43 +02:00
Koncord	6c3c85f0d4	Fix indent ... Remove misc.hpp in containerstore.cpp	2015-07-20 21:53:20 +09:00
Marc Zinnschlag	f3d3cbc58b	Merge remote-tracking branch 'dteviot/refactoringAiWander'	2015-07-20 09:57:46 +02:00
Marc Zinnschlag	d2cd151f77	Merge remote-tracking branch 'kunesj/master'	2015-07-20 09:45:14 +02:00
dteviot	2a4d35b98c	fixed "comma at end of enumerator list" warning.	2015-07-20 18:20:57 +12:00
Koncord	7a86c8d8b6	Fix OpAddItem, OpGetItemCount and OpRemoveItem.	2015-07-20 12:48:19 +09:00
Koncord	a24df8cb66	Revert addImp() and remove() ... add isGold() in MWWorld::Class	2015-07-20 12:43:58 +09:00
Koncord	9485aa5e44	Fix "removeitem gold_100" behavior	2015-07-20 09:53:08 +09:00
Koncord	aefcd1ad07	Fix "additem gold_100" behavior	2015-07-20 08:20:28 +09:00
Koncord	75e5023590	fix code duplication	2015-07-20 08:06:43 +09:00
Jiří Kuneš	a14a3c82de	added description of new syntax to the onRetrieveTag function comment	2015-07-19 19:52:50 +02:00
Marc Zinnschlag	9b3d5c958f	Merge remote-tracking branch 'scrawl/music'	2015-07-19 11:49:00 +02:00
dteviot	00eef585af	renamed mPlayedIdle to mIdleAnimation.	2015-07-19 18:04:42 +12:00
dteviot	22f49128cc	replaced multiple booleans with single state variable.	2015-07-19 18:02:13 +12:00
dteviot	1ed6e95c07	Got rid of some radians to degrees to radians conversions.	2015-07-19 18:01:25 +12:00
dteviot	3ebe9fb34f	renamed mRotate to mTurnActorGivingGreetingToFacePlayer	2015-07-19 18:00:49 +12:00
scrawl	b01abe4d19	Stop title music when the game starts (Fixes #2468)	2015-07-19 02:08:24 +02:00
scrawl	1156668843	Render certain map markers on top of the player arrow (Fixes #2559)	2015-07-19 00:45:02 +02:00
Jiří Kuneš	a5b4e087c5	define owned colours in settings.cfg	2015-07-18 22:17:46 +02:00
Jiří Kuneš	cbc44b33ba	define crosshair owned colour in openmw_hud_box.skin.xml	2015-07-18 21:29:38 +02:00
scrawl	278a078e9d	Unify magic effect tick functions ... - Removes duplicated code - Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)	2015-07-18 20:39:45 +02:00
scrawl	77f1387da8	Include cleanup	2015-07-18 20:36:28 +02:00
Jiří Kuneš	75f5972898	show owned - better settings	2015-07-18 17:13:20 +02:00
Jiří Kuneš	df077f8649	color tooltip red when taking item would result in crime	2015-07-18 16:56:57 +02:00
scrawl	111cf5462b	Merge pull request #666 from scrawl/animation ... Animation refactoring & fixes	2015-07-18 13:33:41 +02:00
Marc Zinnschlag	b3ad983f1f	Merge remote-tracking branch 'scrawl/version' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2015-07-18 12:22:37 +02:00
Marc Zinnschlag	edde1fb727	Merge remote-tracking branch 'scrawl/master'	2015-07-18 11:40:36 +02:00
Marc Zinnschlag	964cd44e96	Merge remote-tracking branch 'kunesj/master'	2015-07-18 11:34:04 +02:00
slothlife	f8f0380413	Fix for loading window icon on Windows	2015-07-17 21:41:53 -05:00
scrawl	a33ca75742	Pass AnimPriority by const reference	2015-07-18 03:23:41 +02:00
scrawl	f09e4620b6	Move OpenMW version information to a textfile instead of compiling it in ... Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.	2015-07-18 03:09:04 +02:00
scrawl	6e493500c9	Show custom map markers on the tooltip of the world map marker (Fixes #2711)	2015-07-18 00:14:11 +02:00
scrawl	41bed4c7d9	Use multimap to speed up custom map marker code	2015-07-17 20:49:10 +02:00
Jiří Kuneš	4a6d806127	fixed comment, save settings to member variable, removed usless include, changed variable to const	2015-07-17 20:30:00 +02:00
Jiří Kuneš	e68b388d16	removed setCrosshairOwned from windowmanager	2015-07-17 19:13:45 +02:00
Jiří Kuneš	c019f8e23d	use correct mechanics manager	2015-07-17 18:49:47 +02:00
Jiří Kuneš	15107ca5cf	crosshair owned - settings option	2015-07-17 17:48:38 +02:00
Jiří Kuneš	66edae9b93	change collor of crosshair	2015-07-17 17:29:00 +02:00
Jiří Kuneš	72728b9c01	disable cusor when item/container is owned	2015-07-17 16:32:35 +02:00
scrawl	91d71d0fcd	Disable MyGUI's scrollbar autorepeat (Fixes #2779) ... We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.	2015-07-17 03:39:09 +02:00
scrawl	660e7f5d89	Don't update animation states in skipAnim mode (Fixes #2782)	2015-07-17 03:28:17 +02:00
scrawl	cc59493cb2	Don't restart the jump animation when equipping a different weapon (Fixes #2286)	2015-07-16 20:03:16 +02:00
scrawl	b5c79738f1	Fix enchantments casting more than once per button press, broken by a1432b0255	2015-07-16 19:56:09 +02:00
scrawl	f6f82d433c	Fix bug with loop key assignment ... Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly. This fixes incorrect playing of the jump animation, one aspect of Bug #2286.	2015-07-16 19:55:05 +02:00
scrawl	f8d360190d	Remove an unneeded virtual	2015-07-15 19:10:09 +02:00