omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
1c3311e4d6
|
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
|
6 years ago |
|
omar
|
fc52364652
|
Tabs to Spaces, comments.
|
6 years ago |
|
omar
|
cdb109f617
|
Renamed freeglut vcxproj files + Comments, Changelog (#2465)
|
6 years ago |
Andrew Willmott
|
ece322ff12
|
freeglut -> glut rename
|
6 years ago |
|
Andrew Willmott
|
3fad375f5f
|
ifdef freeglut extensions properly
|
6 years ago |
|
Andrew Willmott
|
81f70e5b7c
|
Fixups for OSX
|
6 years ago |
|
Andrew Willmott
|
a402f5b9a9
|
Add makefile for freeglut
|
6 years ago |
|
omar
|
5c4cc370bb
|
Examples: Vulkan: Added shader sources/references in the .cpp source.
|
6 years ago |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
6 years ago |
|
omar
|
da035ced97
|
InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467)
+ Fix some output filename in SDL build batch files.
|
6 years ago |
|
omar
|
e3cd6b1cbb
|
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
|
6 years ago |
|
omar
|
3a737e665a
|
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
|
6 years ago |
|
omar
|
e21bbee311
|
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454)
|
6 years ago |
|
omar
|
163779da51
|
Examples: DirectX12: Various tidying up.
|
6 years ago |
|
omar
|
512d39d031
|
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
|
6 years ago |
|
omar
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
20188b19d6
|
Comments (#2441) + Freeglut fixes (#2430)
|
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
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
6 years ago |
|
omar
|
ff03ae503b
|
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421)
|
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
|
a26085ed53
|
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
|
6 years ago |
|
omar
|
9afb849e16
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
cfa8f672f6
|
Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) (#2416)
|
6 years ago |
|
omar
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
6767b0a1b0
|
Examples: Win32+DirectX: moved helper functions below main.
|
6 years ago |
|
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
6 years ago |
Bruce Mitchener
|
b5d57a6615
|
Fix typos. (#2413)
|
6 years ago |
Gilad Reich
|
0a6c5bc234
|
Examples: DirectX9: Added support for multi-viewport (#2394)
|
6 years ago |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
6 years ago |
|
omar
|
49eb5f0280
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
|
6 years ago |
|
omar
|
beb3062dc5
|
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
|
6 years ago |
|
omar
|
9d1a392d7d
|
Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)
|
6 years ago |
Richard Mitton
|
7a536f1bd2
|
Examples + Viewport: GLFW: context wasn't set when using multiple windows. (#2392)
|
6 years ago |
|
omar
|
ff0c6c2bde
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
75641926e1
|
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
# Conflicts:
# examples/imgui_impl_allegro5.cpp
|
6 years ago |
|
omar
|
87ded34f9f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
2068dd509c
|
Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. (#2366, #2186)
|
6 years ago |
|
omar
|
d0c98bf880
|
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
|
6 years ago |
|
omar
|
ff0f9aa856
|
Comments for Linux/Mac (#2117)
|
6 years ago |
|
omar
|
5bf9029bf9
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
d972533d09
|
Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.
|
6 years ago |
|
omar
|
dd14adc731
|
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c for on Metal/GL2/GL3. (#2306, #1676)
|
6 years ago |
|
omar
|
f977871854
|
ImFont: Minor adjustment to the structure.
Examples: Removed unused variable.
|
6 years ago |
|
omar
|
09c9bf2edb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
93d1179805
|
Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency.
Added more link to nothing's oversample document. Spacing bits.
|
6 years ago |