 omar
|
e0c0e53edf
Merge branch 'master' into docking
|
5 years ago |
 Konstantin Podsvirov
|
f0f5301612
Backends: OpenGL3: Commented out extra tokens at end of #else directive (#2804)
|
5 years ago |
|
omar
|
6994bf10bc
Merge branch 'master' into docking + fix for RenderMouseCursor()
|
5 years ago |
|
omar
|
97691643b7
Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3 (#2798)
|
5 years ago |
|
omar
|
575df6f192
Merge branch 'master' into docking
|
5 years ago |
|
omar
|
cc288e073c
Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted.
|
5 years ago |
|
omar
|
e2c1f0a7cd
Merge branch 'master' into docking
|
6 years ago |
 Vincent Hamm
|
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS (#2631)
|
6 years ago |
|
omar
|
63310acd58
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
|
6 years ago |
|
omar
|
431aa4e456
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
6 years ago |
|
omar
|
cc48f1e5dd
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
c3d600abed
Fixed imgui_impl_opengl3 broken in previous few commits. (#2591, #2593, #2594)
|
6 years ago |
|
omar
|
8dc04a4c9f
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
7755cbbef2
Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. (#2591) + Fix OpenGL3 code missing flag.
|
6 years ago |
|
omar
|
c72040a715
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
b3dd03f582
Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591)
|
6 years ago |
 Mario Botsch
|
affa7e2422
Examples: imgui_impl_opengl3: Fix empty printout on shader load. (#2584)
|
6 years ago |
|
omar
|
825b61e4ba
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
ae405b83a4
Examples: Added missing per-renderer local changelogs. (#2037, #1639, #2452)
|
6 years ago |
|
omar
|
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
6 years ago |
|
omar
|
49fb8e6c45
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
512d39d031
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
|
6 years ago |
|
omar
|
9350158d61
Merge branch 'master' into docking
|
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
|
b1af4d36ce
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
55c02099c5
Version 1.69, comments, typos
|
6 years ago |
|
omar
|
49eb5f0280
Merge branch 'master' into docking
|
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 |
|
omar
|
87ded34f9f
Merge branch 'master' into docking
|
6 years ago |
