mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity
11,903 Commits 18 Branches 66 Tags
Commit Graph

7101 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 d77546b7dcbd832ba1b977a63aac0d294eae3663.

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 f5589b42ea499c3f2ed6b9713d1c05f9377c876b.

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 b40c1ff26c7b47a4a8cd27ca50d68b7089ca09d6.
 2014-10-21 17:01:52 +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
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
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
scrawl
c4e81adb83 Fix settings window being too small for all tabs on some localizations 2014-10-16 15:49:01 +02:00
scrawl
244db5cbfe Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33 2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1 fix for implicit references 2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b dagoth fix 2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 2014-10-15 15:00:45 +02:00
Alexander "Ace" Olofsson
dc788512e2 Fix LNK2019 link error on Visual Studio 2010 builds 
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
 2014-10-14 16:10:19 +02:00
Marc Zinnschlag
6beee95151 Merge remote-tracking branch 'terrorfisch/aistate' 2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d Merge remote-tracking branch 'internecine/master' 2014-10-13 19:11:14 +02:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277 Merge remote-tracking branch 'miroslavr/master' 2014-10-13 10:57:04 +02:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max() 
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
 2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa Fix blindness and create a separate fader for it 2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec Don't remove player's sounds when unloading a cell 2014-10-12 18:35:15 +02:00
scrawl
d51daf5875 Fix AI not using F_Always spells, for example "vampire touch" 2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound' 
Conflicts:
	apps/openmw/mwworld/class.cpp
 2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930 Fixes #1887: Equipped items do not emit sounds 
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-12 13:38:41 +02:00