9020 commits

Author	SHA1	Message	Date
Marc Zinnschlag	c1d867a213	Merge remote-tracking branch 'origin/master'	2014-10-22 09:48:30 +02:00
Marc Zinnschlag	8f0add75f5	Merge remote-tracking branch 'scrawl/master'	2014-10-22 09:42:28 +02:00
Marc Zinnschlag	94d5151273	Merge remote-tracking branch 'miroslavr/master'	2014-10-22 09:39:54 +02:00
scrawl	bcb2d714c0	Add TODO comments for future videoplayer enhancements	2014-10-21 23:46:04 +02:00
scrawl	41df4289c6	Merge remote-tracking branch 'upstream/openmw-33' into HEAD ... Conflicts: apps/openmw/mwworld/store.hpp	2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson	b5a57920b6	Fix compile error on Windows	2014-10-21 19:35:17 +02:00
scrawl	5711103322	Remove leftover comment	2014-10-21 17:51:59 +02:00
scrawl	202cfa879f	Implement frame drop support in the videoplayer (Fixes #1343)	2014-10-21 17:01:53 +02:00
scrawl	290aacd2a6	Fix videoplayer crash on quit ... The sound stream thread was trying to update the stream during/after destruction of the video state.	2014-10-21 17:01:53 +02:00
scrawl	8472695f89	Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." ... This reverts commit d77546b7dc. Conflicts: apps/openmw/mwrender/videoplayer.cpp	2014-10-21 17:01:53 +02:00
scrawl	de0e0fedff	Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." ... This reverts commit f5589b42ea. Conflicts: apps/openmw/mwrender/videoplayer.cpp	2014-10-21 17:01:53 +02:00
scrawl	681f3fa530	Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder." ... This reverts commit b40c1ff26c.	2014-10-21 17:01:52 +02:00
Marc Zinnschlag	5fdd264d07	Merge remote-tracking branch 'origin/master'	2014-10-21 12:38:35 +02:00
Marc Zinnschlag	843493e90a	fixed case-problem in OpenCS script compiler	2014-10-21 12:38:18 +02:00
scrawl	8b3755a770	Compile fix	2014-10-20 17:45:24 +02:00
scrawl	f2877c69d7	Fix old alchemy apparatus still showing in alchemy window after removal	2014-10-20 17:45:18 +02:00
scrawl	192069a181	Add automatic potion naming	2014-10-20 17:45:11 +02:00
scrawl	fd7c181e06	Fix alchemy producing potion IDs from content files	2014-10-20 17:45:06 +02:00
scrawl	9bb51fd9c2	Compile fix	2014-10-20 17:42:51 +02:00
scrawl	ace8e0175b	Fix old alchemy apparatus still showing in alchemy window after removal	2014-10-20 17:28:51 +02:00
scrawl	29ac97be7a	Add automatic potion naming	2014-10-20 17:28:51 +02:00
scrawl	7f06e3e7e3	Fix alchemy producing potion IDs from content files	2014-10-20 17:07:54 +02:00
MiroslavR	5a7dbb19f7	Code clarity	2014-10-20 01:10:08 +02:00
scrawl	4047e3c928	Properly handle DialInfo records that were marked as Deleted (Fixes #2035)	2014-10-19 17:46:28 +02:00
scrawl	b0f98687e6	Properly handle DialInfo records that were marked as Deleted (Fixes #2035)	2014-10-19 17:45:18 +02:00
Marc Zinnschlag	94ae222f0e	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
Marc Zinnschlag	a5bbfff9e2	another layout correction	2014-10-19 13:43:40 +02:00
Marc Zinnschlag	5a1ce4943e	added advance 3D rendering user settings section	2014-10-19 13:41:56 +02:00
MiroslavR	ed6bdc0bde	Use all topics to search for keywords in dialogues (Fixes #2013) ... Move KeywordSearch to MWDialogue Move hypertext parsing functions to a new file	2014-10-18 20:07:40 +02:00
scrawl	deabc52c16	Treat "Root Bone" as the animation root if existing (Fixes #2019)	2014-10-17 23:29:59 +02:00
scrawl	415f67f859	Treat "Root Bone" as the animation root if existing (Fixes #2019)	2014-10-17 23:29:13 +02:00
scrawl	5892fd9e65	Fix NpcAnimation non-existing skeleton crash (Fixes #2028)	2014-10-17 23:07:01 +02:00
scrawl	8233f5894a	Fix NpcAnimation non-existing skeleton crash (Fixes #2028)	2014-10-17 23:04:36 +02:00
scrawl	f117a75747	Force walk animation when flying (Fixes #2015)	2014-10-17 19:11:06 +02:00
scrawl	5f11ccc298	Show tooltip for non-affordable list items (Fixes #2025)	2014-10-17 19:02:31 +02:00
scrawl	2be65a89a7	Show tooltip for non-affordable list items (Fixes #2025)	2014-10-17 19:01:28 +02:00
Marc Zinnschlag	2106893563	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:47:31 +02:00
Marc Zinnschlag	49938182e8	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:46:07 +02:00
Marc Zinnschlag	a3c894c1e2	Merge branch 'cellmarker'	2014-10-17 14:26:16 +02:00
Marc Zinnschlag	994159fafd	fixed broken iterator	2014-10-17 14:23:37 +02:00
Marc Zinnschlag	8a05c0e5c0	fixed overlay singleton	2014-10-17 14:23:27 +02:00
Marc Zinnschlag	ba46bcad40	Revert "Don't allow viewing non-existent cells from the regionmap." ... This reverts commit 7cdab41501.	2014-10-17 13:52:21 +02:00
Marc Zinnschlag	4b921c3876	user settings cleanup	2014-10-17 13:49:33 +02:00
Marc Zinnschlag	c97845d35d	better script compiler diagnostics	2014-10-17 10:59:25 +02:00
scrawl	c3ef39eb6f	Fix ItemWidget text cleanup (Fixes #2022)	2014-10-17 02:41:43 +02:00
Marc Zinnschlag	ed44f3ec7d	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
scrawl	c4e81adb83	Fix settings window being too small for all tabs on some localizations	2014-10-16 15:49:01 +02:00
Marc Zinnschlag	f4894deff1	removed special value text from spin boxes (broken feature, not used anyway)	2014-10-16 14:47:55 +02:00
Marc Zinnschlag	dddd20ba1e	added default values for display format settings	2014-10-16 14:31:13 +02:00
Marc Zinnschlag	799cd87b52	name convention and spelling fixes	2014-10-16 14:24:17 +02:00