diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c6a0885..35b901033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,6 +125,7 @@ Feature #5033: Magic armor mitigation for creatures Feature #5034: Make enchanting window stay open after a failed attempt Feature #5036: Allow scripted faction leaving + Feature #5051: Provide a separate textures for scrollbars Task #4686: Upgrade media decoder to a more current FFmpeg API Task #4695: Optimize Distant Terrain memory consumption Task #4721: Add NMake support to the Windows prebuild script diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index c67aaffa4..07127d28b 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -283,7 +283,8 @@ void OMW::Engine::enableFSStrict(bool fsStrict) void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs) { mDataDirs = dataDirs; - mFileCollections = Files::Collections (dataDirs, !mFSStrict); + mDataDirs.insert(mDataDirs.begin(), (mResDir / "vfs")); + mFileCollections = Files::Collections (mDataDirs, !mFSStrict); } // Add BSA archive diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index 51a256345..a39dd2e39 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -192,6 +192,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat cfgMgr.processPaths(dataDirs); + engine.setResourceDir(variables["resources"].as().toStdString()); engine.setDataDirs(dataDirs); // fallback archives @@ -201,8 +202,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat engine.addArchive(*it); } - engine.setResourceDir(variables["resources"].as().toStdString()); - StringsVector content = variables["content"].as().toStdStringVector(); if (content.empty()) { diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt index 75cb6a9b0..98123acb9 100644 --- a/files/CMakeLists.txt +++ b/files/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(mygui) add_subdirectory(shaders) +add_subdirectory(vfs) diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout index 3b0a0191f..71f6dc476 100644 --- a/files/mygui/openmw_chargen_race.layout +++ b/files/mygui/openmw_chargen_race.layout @@ -19,37 +19,37 @@ - + - + - + - + - + - + diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml index 8795d9bbd..ccaeb0319 100644 --- a/files/mygui/openmw_list.skin.xml +++ b/files/mygui/openmw_list.skin.xml @@ -22,10 +22,10 @@ - + - + @@ -35,10 +35,10 @@ - - - - + + + + @@ -64,10 +64,10 @@ - + - + @@ -80,11 +80,10 @@ - + - - - + + @@ -205,27 +204,27 @@ - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt new file mode 100644 index 000000000..a97210d1d --- /dev/null +++ b/files/vfs/CMakeLists.txt @@ -0,0 +1,18 @@ +if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT) + return() +endif() + +# Copy resource files into the build directory +set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(DDIRRELATIVE resources/vfs/textures) + +set(TEXTURE_FILES + textures/omw_menu_scroll_down.dds + textures/omw_menu_scroll_up.dds + textures/omw_menu_scroll_left.dds + textures/omw_menu_scroll_right.dds + textures/omw_menu_scroll_center_h.dds + textures/omw_menu_scroll_center_v.dds +) + +copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_MYGUI_FILES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}") diff --git a/files/vfs/textures/omw_menu_scroll_center_h.dds b/files/vfs/textures/omw_menu_scroll_center_h.dds new file mode 100644 index 000000000..38c09a590 Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_center_h.dds differ diff --git a/files/vfs/textures/omw_menu_scroll_center_v.dds b/files/vfs/textures/omw_menu_scroll_center_v.dds new file mode 100644 index 000000000..156255614 Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_center_v.dds differ diff --git a/files/vfs/textures/omw_menu_scroll_down.dds b/files/vfs/textures/omw_menu_scroll_down.dds new file mode 100644 index 000000000..f005fd0b7 Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_down.dds differ diff --git a/files/vfs/textures/omw_menu_scroll_left.dds b/files/vfs/textures/omw_menu_scroll_left.dds new file mode 100644 index 000000000..fec7c0599 Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_left.dds differ diff --git a/files/vfs/textures/omw_menu_scroll_right.dds b/files/vfs/textures/omw_menu_scroll_right.dds new file mode 100644 index 000000000..7b5011bbd Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_right.dds differ diff --git a/files/vfs/textures/omw_menu_scroll_up.dds b/files/vfs/textures/omw_menu_scroll_up.dds new file mode 100644 index 000000000..9261490c1 Binary files /dev/null and b/files/vfs/textures/omw_menu_scroll_up.dds differ