From 62c5568ed9138eb679f0427a2ea655af872303eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20S=C3=B6derberg?= Date: Sun, 24 Feb 2013 16:57:07 +0100 Subject: [PATCH 1/4] Fix for the loadingbar to resemble vanilla Morrowind. --- files/mygui/openmw_loading_screen.layout | 4 ++-- files/mygui/openmw_progress.skin.xml | 13 +++++++++++++ files/mygui/smallbars.png | Bin 246 -> 3205 bytes 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout index 6862702ca1..4b6861151a 100644 --- a/files/mygui/openmw_loading_screen.layout +++ b/files/mygui/openmw_loading_screen.layout @@ -6,12 +6,12 @@ - + - + diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml index c4b94e28e2..4666be2217 100644 --- a/files/mygui/openmw_progress.skin.xml +++ b/files/mygui/openmw_progress.skin.xml @@ -17,6 +17,11 @@ + + + + + @@ -51,4 +56,12 @@ + + + + + + + + diff --git a/files/mygui/smallbars.png b/files/mygui/smallbars.png index a9ed572ef6dd53092f3e35dd1fc871a60686e91d..f938412c259c540d8e085a339fa0d94c4294a361 100644 GIT binary patch literal 3205 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 V+qrc3Ge{oT%#5rJt6*+1{{u-NeNq4b delta 212 zcmV;_04x868TJ8?7Z(}`0ssI2A5Ut+00001b5ch_0Itp)>5(B9e*gz`Nliru*#ZX- z6CpS#nr{FA0EkIMK~xyiZP3990znLg;Xh%(5~&##IK14YFH6+F=H0OkN?-L%E#W(hUno^d&x2M`?)6%mba5mg|}wqAOD zjaaLXgil6Y2Ck=DGTNi*9(IC(f}_*`XaN-7J;m0Vu(X6{noP6(|JxT0PCY1eTX63H O0000 Date: Sun, 24 Feb 2013 16:57:40 +0100 Subject: [PATCH 2/4] Prettier repeated borders. --- files/mygui/openmw_hud_box.skin.xml | 88 +++++++++++++++-------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml index ce231e5bb9..464b6343aa 100644 --- a/files/mygui/openmw_hud_box.skin.xml +++ b/files/mygui/openmw_hud_box.skin.xml @@ -2,76 +2,78 @@ - - - + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + - - - + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - From 7ea1f6a02a06e83a153ff85c7f3b5ab210c37ca7 Mon Sep 17 00:00:00 2001 From: Nathan Jeffords Date: Sun, 27 Jan 2013 00:23:10 -0800 Subject: [PATCH 3/4] fixes for using FFMPEG on windows --- apps/openmw/mwsound/ffmpeg_decoder.cpp | 4 ++++ cmake/FindFFmpeg.cmake | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp index 00530a9628..54df45ff4c 100644 --- a/apps/openmw/mwsound/ffmpeg_decoder.cpp +++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp @@ -153,6 +153,10 @@ void FFmpeg_Decoder::open(const std::string &fname) try { + for(size_t j = 0;j < mFormatCtx->nb_streams;j++) + if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16; + if(avformat_find_stream_info(mFormatCtx, NULL) < 0) fail("Failed to find stream info in "+fname); diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index c80203a25b..4147590d60 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -68,6 +68,7 @@ macro(find_component _component _pkgconfig _library _header) find_path(${_component}_INCLUDE_DIRS ${_header} HINTS + ${FFMPEGSDK_INC} ${PC_LIB${_component}_INCLUDEDIR} ${PC_LIB${_component}_INCLUDE_DIRS} PATH_SUFFIXES @@ -76,6 +77,7 @@ macro(find_component _component _pkgconfig _library _header) find_library(${_component}_LIBRARIES NAMES ${_library} HINTS + ${FFMPEGSDK_LIB} ${PC_LIB${_component}_LIBDIR} ${PC_LIB${_component}_LIBRARY_DIRS} ) @@ -97,6 +99,12 @@ endmacro() # Check for cached results. If there are skip the costly part. if (NOT FFMPEG_LIBRARIES) + set (FFMPEGSDK ENV${FFMPEG_HOME}) + if (FFMPEGSDK) + set (FFMPEGSDK_INC "${FFMPEGSDK}/include") + set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib") + endif () + # Check for all possible component. find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) find_component(AVFORMAT libavformat avformat libavformat/avformat.h) From e060713aa350b110c7b9e55f768c558048727d48 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Sun, 24 Feb 2013 20:37:29 +0100 Subject: [PATCH 4/4] updated credits file --- credits.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/credits.txt b/credits.txt index 8b396aad0a..535e922ae1 100644 --- a/credits.txt +++ b/credits.txt @@ -29,6 +29,7 @@ Jannik Heller (scrawl) Jason Hooks (jhooks) Joel Graff (graffy) Karl-Felix Glatzer (k1ll) +Lars Söderberg (Lazaroth) lazydev Leon Saunders (emoose) Lukasz Gromanowski (lgro)