diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ac9654..f209eb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif() project( NavKit - VERSION 0.7 + VERSION 0.7.1 DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman" LANGUAGES CXX) diff --git a/bin/glacier2obj.py b/bin/glacier2obj.py index 9e31561..fb62847 100644 --- a/bin/glacier2obj.py +++ b/bin/glacier2obj.py @@ -2089,7 +2089,7 @@ def load_scenario(context, collection, path_to_prims_json, path_to_pf_boxes_json print("Error Loading prim:", flush=True) print(prim_hash, flush=True) return 1 - lowest_lod = 9 + lowest_lod = 7 for obj in objects: for j in range(0, 8): if obj.data['prim_properties']['lod'][j] == 1 and lowest_lod > j: diff --git a/include/NavKit/NavKitConfig.h b/include/NavKit/NavKitConfig.h index b532a82..b0c757d 100644 --- a/include/NavKit/NavKitConfig.h +++ b/include/NavKit/NavKitConfig.h @@ -1,2 +1,3 @@ #define NavKit_VERSION_MAJOR "0" #define NavKit_VERSION_MINOR "7" +#define NavKit_VERSION_PATCH "1" diff --git a/include/NavKit/NavKitConfig.h.in b/include/NavKit/NavKitConfig.h.in index b68f1bf..392d902 100644 --- a/include/NavKit/NavKitConfig.h.in +++ b/include/NavKit/NavKitConfig.h.in @@ -1,2 +1,3 @@ #define NavKit_VERSION_MAJOR "@NavKit_VERSION_MAJOR@" -#define NavKit_VERSION_MINOR "@NavKit_VERSION_MINOR@" \ No newline at end of file +#define NavKit_VERSION_MINOR "@NavKit_VERSION_MINOR@" +#define NavKit_VERSION_PATCH "@NavKit_VERSION_PATCH@" \ No newline at end of file diff --git a/src/Navp.cpp b/src/Navp.cpp index 775ecce..648143f 100644 --- a/src/Navp.cpp +++ b/src/Navp.cpp @@ -160,8 +160,14 @@ void Navp::buildNavp(Navp* navp) { } void Navp::drawMenu() { - if (imguiBeginScrollArea("Navp menu", 10, navKit->renderer->height - 1140 - 10, 250, 1140, &navpScroll)) - navKit->gui->mouseOverMenu = true; + if (navKit->renderer->height > 1080) { + if (imguiBeginScrollArea("Navp menu", 10, navKit->renderer->height - 1140 - 10, 250, 1140, &navpScroll)) + navKit->gui->mouseOverMenu = true; + } + else { + if (imguiBeginScrollArea("Navp menu", 10, navKit->renderer->height - 950 - 10, 250, 950, &navpScroll)) + navKit->gui->mouseOverMenu = true; + } if (imguiCheck("Show Navp", showNavp)) showNavp = !showNavp; imguiLabel("Load Navp from file"); diff --git a/src/Renderer.cpp b/src/Renderer.cpp index 313a59a..dcf4132 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -78,7 +78,7 @@ bool Renderer::initWindowAndRenderer() { } SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); - std::string navKitVersion = NavKit_VERSION_MAJOR "." NavKit_VERSION_MINOR; + std::string navKitVersion = NavKit_VERSION_MAJOR "." NavKit_VERSION_MINOR "." NavKit_VERSION_PATCH; std::string title = "NavKit v"; title += navKitVersion; SDL_SetWindowTitle(window, title.data());