10916 commits

Author	SHA1	Message	Date
scrawl	77f1387da8	Include cleanup	2015-07-18 20:36:28 +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	e921552053	Merge remote-tracking branch 'scrawl/opencs'	2015-07-18 11:58:20 +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	58720e6a28	Fix the OpenCS rendering crash on exit (Fixes #2735)	2015-07-18 03:52:48 +02: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	c783b50a83	Fix config file priority in the launcher to match OpenMW	2015-07-18 01:38:35 +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
scrawl	992b770315	Don't set OnPcEquip for items that failed to equip (Fixes #2776)	2015-07-15 18:52:23 +02:00
scrawl	17ada63fcb	Don't play turning animations on the upperbody when in first person mode (Fixes #2287)	2015-07-15 16:43:11 +02:00
scrawl	3656851750	Remove the now unused changeBlendMask	2015-07-15 16:43:11 +02:00
scrawl	83cceeee72	Use the extended animation priority for Block animations, allow starting attacks during a block animation (Fixes #2761)	2015-07-15 16:43:11 +02:00
scrawl	cf14d1748c	Use the extended animation priority for Hit animations	2015-07-15 16:33:10 +02:00
scrawl	50db6ed396	Use the extended animation priority for weapon animations	2015-07-15 14:40:36 +02:00
scrawl	e93a578f23	Extend the animation priority system to one priority value per bone group / distinct blend mask	2015-07-15 14:18:31 +02:00
scrawl	335ef97cf5	Rename Animation::Group to Animation::BlendMask ... The old naming is problematic, because the term group was being used for another feature (text key groups) already.	2015-07-15 13:49:16 +02:00
scrawl	de6dc21552	Create hardware cursors in advance (Fixes #2660)	2015-07-13 23:36:25 +02:00
scrawl	dca4704b4b	Print exceptions in CharacterCreation::spawnDialog	2015-07-13 18:40:05 +02:00
scrawl	f1b52c964a	Select the current resolution in resolution list on game start (Fixes #2768)	2015-07-13 18:00:41 +02:00
Marc Zinnschlag	d22f8703e5	Merge remote-tracking branch 'dteviot/refactoringAiWander'	2015-07-13 09:09:01 +02:00
dteviot	ddeabcdfbe	Removed unused field that was giving compiler warning.	2015-07-12 17:15:41 +12:00
dteviot	e294cd95cd	extracted function playIdleDialogueRandomly()	2015-07-12 17:15:14 +12:00
dteviot	22059d68f6	Remove duplicated code.	2015-07-12 17:14:48 +12:00
dteviot	0b089a5564	extracted function evadeObstacles()	2015-07-12 16:38:36 +12:00
dteviot	1ef78b1e56	extracted playGreetingIfPlayerGetsTooClose()	2015-07-12 16:37:31 +12:00
dteviot	df421fce92	extracted function setPathToAnAllowedNode()	2015-07-12 16:35:15 +12:00
dteviot	b508846a64	Renamed mStoredAvailableNodes to mPopulateAvailableNodes. ... Don't call getAllowedNodes() needlessly.	2015-07-12 16:32:48 +12:00
Marc Zinnschlag	dacb93c57f	Merge remote-tracking branch 'scrawl/coverity_scan'	2015-07-11 11:53:43 +02:00
scrawl	0ed3e3e489	Fix cout/cerr mixup	2015-07-11 04:27:41 +02:00
scrawl	24ae1d5ace	Fix some issues found by coverity	2015-07-11 03:34:08 +02:00
scrawl	667c80fb2a	Add brackets around a correct expression to fix coverity warning	2015-07-11 03:34:08 +02:00
scrawl	ebdd5dc993	Fix code that I forgot to uncomment (thanks coverity)	2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson	12f413ba9b	Don't instantiate specialized templates ... This fixes the VS2012 build issue	2015-07-10 20:21:55 +02:00