omar
|
aedcd2fb1a
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
|
5 years ago |
|
omar
|
f624455d7b
|
Version 1.73 WIP
|
5 years ago |
|
omar
|
b8d8355f10
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
5 years ago |
|
omar
|
6a0d0dab5a
|
Version 1.72b (patch for nav)
|
5 years ago |
|
omar
|
9183e7c426
|
Version 1.73 WIP
|
5 years ago |
|
omar
|
a1164399b0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
5 years ago |
|
omar
|
ecb9b1e2eb
|
Version 1.72
|
5 years ago |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
5 years ago |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
5 years ago |
|
omar
|
b27fd87177
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
5 years ago |
|
omar
|
5286ecb8a7
|
Version 1.72 WIP
|
5 years ago |
|
omar
|
d3d998a885
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
5 years ago |
|
omar
|
2da1c66d15
|
Version 1.71 + comments
|
5 years ago |
|
omar
|
4597632662
|
Readme, comments, dear imgui prefixes
|
5 years ago |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
5 years ago |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
5 years ago |
|
omar
|
d1d5075b66
|
Version 1.70
|
6 years ago |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
6 years ago |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
cdb109f617
|
Renamed freeglut vcxproj files + Comments, Changelog (#2465)
|
6 years ago |
Andrew Willmott
|
ece322ff12
|
freeglut -> glut rename
|
6 years ago |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
6 years ago |
|
omar
|
b1af4d36ce
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
|
omar
|
55c02099c5
|
Version 1.69, comments, typos
|
6 years ago |
|
omar
|
49eb5f0280
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
|
6 years ago |
|
omar
|
9d1a392d7d
|
Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)
|
6 years ago |
|
omar
|
cb9a6b8a8b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/README.txt
# imgui.cpp
|
6 years ago |
|
omar
|
54ba8a643e
|
Removed trailing spaces from text files. (#2038, #2299)
|
6 years ago |
|
omar
|
82e31d34f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
295ada0364
|
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
|
6 years ago |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
6 years ago |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
6 years ago |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
d5793102db
|
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873)
|
6 years ago |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
89e2ddf07f
|
Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx
|
6 years ago |
|
omar
|
569e0f07f1
|
Examples: Removed old example_apple/ + tweak comments (#1873)
|
6 years ago |
|
Omar Cornut
|
c3f9220c15
|
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
|
6 years ago |
|
omar
|
0d7e779b37
|
Merge branch 'master' into osx
# Conflicts:
# examples/.gitignore
# examples/README.txt
|
6 years ago |
|
omar
|
ce500f8727
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
2ce121b7d0
|
Readme, Links, Bindings
|
6 years ago |
|
omar
|
40845852b9
|
Fixed warnings + readme
|
6 years ago |
|
omar
|
24aeca3d0c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
cdf51cad2d
|
Comments, documentation
|
6 years ago |