Skip to content

Commit

Permalink
Version 1.71 WIP + fixed minor typo
Browse files Browse the repository at this point in the history
  • Loading branch information
ocornut committed May 7, 2019
1 parent d1d5075 commit 42fc563
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 11 deletions.
8 changes: 8 additions & 0 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ HOW TO UPDATE?
and API updates have been a little more frequent lately. They are documented below and in imgui.cpp and should not affect all users.
- Please report any issue!

-----------------------------------------------------------------------
VERSION 1.71 (In Progress)
-----------------------------------------------------------------------

Breaking Changes:

Other Changes:


-----------------------------------------------------------------------
VERSION 1.70 (Released 2019-05-06)
Expand Down
4 changes: 2 additions & 2 deletions examples/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-----------------------------------------------------------------------
dear imgui, v1.70
dear imgui, v1.71 WIP
-----------------------------------------------------------------------
examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation)
Expand Down Expand Up @@ -175,7 +175,7 @@ example_empscripten:
We provide this to make the Emscripten differences obvious, and have them not pollute all other examples.

example_glfw_metal/
GLFW (Mac) + Vulkan example.
GLFW (Mac) + Metal example.
= main.mm + imgui_impl_glfw.cpp + imgui_impl_metal.mm.

example_glfw_opengl2/
Expand Down
2 changes: 1 addition & 1 deletion imgui.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 WIP
// (main code and documentation)

// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.
Expand Down
6 changes: 3 additions & 3 deletions imgui.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 WIP
// (headers)

// See imgui.cpp file for documentation.
Expand Down Expand Up @@ -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.70"
#define IMGUI_VERSION_NUM 17000
#define IMGUI_VERSION "1.71"
#define IMGUI_VERSION_NUM 17001
#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)
Expand Down
2 changes: 1 addition & 1 deletion imgui_demo.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 WIP
// (demo code)

// Message to the person tempted to delete this file when integrating Dear ImGui into their code base:
Expand Down
2 changes: 1 addition & 1 deletion imgui_draw.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 WIP
// (drawing and font code)

/*
Expand Down
2 changes: 1 addition & 1 deletion imgui_internal.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 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!
Expand Down
2 changes: 1 addition & 1 deletion imgui_widgets.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dear imgui, v1.70
// dear imgui, v1.71 WIP
// (widgets code)

/*
Expand Down
2 changes: 1 addition & 1 deletion misc/fonts/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dear imgui, v1.70
dear imgui, v1.71 WIP
(Font Readme)

---------------------------------------
Expand Down

0 comments on commit 42fc563

Please sign in to comment.