From 95ee99e6aa3127e2507d347d08b05cdda309bfaf Mon Sep 17 00:00:00 2001 From: omar Date: Tue, 15 Jan 2019 20:19:05 +0100 Subject: [PATCH] Version 1.68 WIP --- docs/CHANGELOG.txt | 7 ++++++- imgui.cpp | 2 +- imgui.h | 6 +++--- imgui_demo.cpp | 2 +- imgui_draw.cpp | 2 +- imgui_internal.h | 2 +- imgui_widgets.cpp | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index b9a5fc55..840e8aa9 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -30,7 +30,12 @@ HOW TO UPDATE? ----------------------------------------------------------------------- - VERSION 1.67 (In Progress) + VERSION 1.68 +----------------------------------------------------------------------- + + +----------------------------------------------------------------------- + VERSION 1.67 (Released 2019-01-14) ----------------------------------------------------------------------- Breaking Changes: diff --git a/imgui.cpp b/imgui.cpp index 9bdd8eed..8a59705e 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (main code and documentation) // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. diff --git a/imgui.h b/imgui.h index 26d642b7..dba7d908 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (headers) // See imgui.cpp file for documentation. @@ -45,8 +45,8 @@ Index of this file: // Version // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens) -#define IMGUI_VERSION "1.67" -#define IMGUI_VERSION_NUM 16603 +#define IMGUI_VERSION "1.68 WIP" +#define IMGUI_VERSION_NUM 16800 #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index c5cd34aa..30303285 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (demo code) // Message to the person tempted to delete this file when integrating Dear ImGui into their code base: diff --git a/imgui_draw.cpp b/imgui_draw.cpp index 12686849..21f52bfe 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (drawing and font code) /* diff --git a/imgui_internal.h b/imgui_internal.h index f7137c93..14296b51 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (internal structures/api) // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 058d6a4c..8ccf8bdf 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.67 +// dear imgui, v1.68 WIP // (widgets code) /*