From c262276988da6ae4b16911d9c56fc8d9226e7319 Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 30 Sep 2019 14:27:56 +0200 Subject: [PATCH] Version 1.74 WIP --- docs/CHANGELOG.txt | 11 +++++++++++ examples/README.txt | 2 +- imgui.cpp | 2 +- imgui.h | 6 +++--- imgui_demo.cpp | 2 +- imgui_draw.cpp | 2 +- imgui_internal.h | 2 +- imgui_widgets.cpp | 2 +- misc/fonts/README.txt | 2 +- 9 files changed, 21 insertions(+), 10 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 219e9fced..8ef15ad7f 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -29,6 +29,17 @@ HOW TO UPDATE? - Please report any issue! +----------------------------------------------------------------------- + VERSION 1.74 WIP (In Progress) +----------------------------------------------------------------------- + +Breaking Changes: +- + +Other Changes: +- + + ----------------------------------------------------------------------- VERSION 1.73 (Released 2019-09-24) ----------------------------------------------------------------------- diff --git a/examples/README.txt b/examples/README.txt index 031a53b97..23c6bdb96 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -1,5 +1,5 @@ ----------------------------------------------------------------------- - dear imgui, v1.73 + dear imgui, v1.74 WIP ----------------------------------------------------------------------- examples/README.txt (This is the README file for the examples/ folder. See docs/ for more documentation) diff --git a/imgui.cpp b/imgui.cpp index 93b15ddb9..cee65ff84 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 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 9697c80db..8696ef4df 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 WIP // (headers) // See imgui.cpp file for documentation. @@ -46,8 +46,8 @@ Index of this file: // Version // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens) -#define IMGUI_VERSION "1.73" -#define IMGUI_VERSION_NUM 17300 +#define IMGUI_VERSION "1.74 WIP" +#define IMGUI_VERSION_NUM 17301 #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index ec1ada820..41c26546d 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 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 845cd04e8..4a6dce6d1 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 WIP // (drawing and font code) /* diff --git a/imgui_internal.h b/imgui_internal.h index 6d3931039..19f2bfef1 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 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 bcd051e57..838f93671 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.74 WIP // (widgets code) /* diff --git a/misc/fonts/README.txt b/misc/fonts/README.txt index 51a97f934..39e0dd48d 100644 --- a/misc/fonts/README.txt +++ b/misc/fonts/README.txt @@ -1,5 +1,5 @@ ---------------------------------------------------------------------- - dear imgui, v1.73 + dear imgui, v1.74 WIP ---------------------------------------------------------------------- misc/fonts/README.txt This is the Readme dedicated to fonts.