omar
|
b8e2b2bd6b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-04-12 20:24:18 +02:00 |
|
omar
|
5503c0a12e
|
Version 1.76
+ fixed PVS warning, update demo binaries, update readme image
|
2020-04-12 20:18:47 +02:00 |
|
omar
|
0e884304ee
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.h
|
2020-04-02 14:27:48 +02:00 |
|
omar
|
f2b01c3436
|
Changelog, tweak OpenGL3 backends. (#3061), update Gallery thread links.
|
2020-03-24 18:45:05 +01:00 |
|
omar
|
16a9488c13
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
|
2020-03-19 12:44:53 +01:00 |
|
omar
|
d8824f9a9a
|
CI: Clarify purpose of example_null, Changelog
|
2020-03-19 11:13:52 +01:00 |
|
Omar
|
bb1e6f8af6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2020-02-17 18:33:59 +01:00 |
|
omar
|
ccaec1a270
|
Version 1.76 WIP
|
2020-02-11 16:56:56 +01:00 |
|
Rokas Kupstys
|
21b9e42964
|
Minor fixes to example_sdl_metal and a changelog entry.
Add example_sdl_metal to CI builds.
Closes #3017.
|
2020-02-10 16:53:37 +01:00 |
|
omar
|
8432d1bfc7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2020-02-10 14:03:12 +01:00 |
|
omar
|
58b3e02b95
|
Version 1.75
Comments
|
2020-02-10 14:02:41 +01:00 |
|
omar
|
f5528001f6
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# imgui.cpp
# imgui_internal.h
|
2020-01-27 14:57:00 +01:00 |
|
omar
|
4d4e3b97f4
|
TODO, Readme
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
|
2020-01-27 12:37:06 +01:00 |
|
omar
|
3fe6ae9732
|
Internals: Move some Nav functions and members around (no functional change) + Misc comments
|
2020-01-20 18:19:03 +01:00 |
|
omar
|
44174b1fa1
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
|
2020-01-14 20:01:27 +01:00 |
|
omar
|
ff5299e0e0
|
Docs: FAQ, Comments.
|
2020-01-12 22:09:18 +01:00 |
|
omar
|
861f786d81
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-01-10 14:38:09 +01:00 |
|
Rokas Kupstys
|
5e2329b98e
|
Backends: GL3: Implement glbinding opengl loader support. (#2870)
|
2020-01-07 21:06:37 +01:00 |
|
omar
|
992736dc5d
|
Merge branch 'refs/heads/master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2019-12-13 17:06:27 +01:00 |
|
omar
|
abaf0256b8
|
Version 1.75 WIP
Added message to font file loading assert.
|
2019-11-28 20:58:16 +01:00 |
|
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
bdce833636
|
Version 1.74
|
2019-11-25 18:38:53 +01:00 |
|
omar
|
0cbb96895a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
|
2019-10-24 15:11:37 +02:00 |
|
omar
|
048b73dfaa
|
Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.
|
2019-10-21 20:57:07 +02:00 |
|
omar
|
e0c0e53edf
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-10-04 19:22:42 +02:00 |
|
omar
|
c262276988
|
Version 1.74 WIP
|
2019-09-30 14:27:56 +02:00 |
|
omar
|
6994bf10bc
|
Merge branch 'master' into docking + fix for RenderMouseCursor()
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
|
2019-09-24 17:14:51 +02:00 |
|
omar
|
d5efe16157
|
Version 1.73
|
2019-09-24 17:02:26 +02:00 |
|
omar
|
aedcd2fb1a
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
|
2019-08-19 21:49:53 +02:00 |
|
omar
|
f624455d7b
|
Version 1.73 WIP
|
2019-08-01 10:57:13 -07:00 |
|
omar
|
b8d8355f10
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-31 14:34:58 -07:00 |
|
omar
|
6a0d0dab5a
|
Version 1.72b (patch for nav)
|
2019-07-31 14:31:06 -07:00 |
|
omar
|
9183e7c426
|
Version 1.73 WIP
|
2019-07-29 15:54:32 -07:00 |
|
omar
|
a1164399b0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-07-27 18:21:41 -07:00 |
|
omar
|
ecb9b1e2eb
|
Version 1.72
|
2019-07-27 18:15:07 -07:00 |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
2019-06-18 11:28:26 +02:00 |
|
omar
|
b27fd87177
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
2019-06-17 11:10:14 +02:00 |
|
omar
|
5286ecb8a7
|
Version 1.72 WIP
|
2019-06-14 11:58:58 +02:00 |
|
omar
|
d3d998a885
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2019-06-12 18:40:50 +02:00 |
|
omar
|
2da1c66d15
|
Version 1.71 + comments
|
2019-06-12 18:30:06 +02:00 |
|
omar
|
4597632662
|
Readme, comments, dear imgui prefixes
|
2019-06-11 16:11:36 +02:00 |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
2019-05-07 16:36:08 +02:00 |
|
omar
|
d1d5075b66
|
Version 1.70
|
2019-05-06 14:17:39 +02:00 |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2019-05-06 10:16:43 +02:00 |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
2019-05-06 10:02:59 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
2019-04-15 01:28:44 +02:00 |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
2019-04-04 22:10:18 +02:00 |
|