ocornut
|
7ab49f80ca
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
|
2015-04-09 21:22:06 +01:00 |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
2015-04-09 21:19:21 +01:00 |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
2015-04-09 21:18:43 +01:00 |
|
ocornut
|
1746b04065
|
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
|
2015-04-09 21:05:35 +01:00 |
|
Dale Kim
|
4b7be31197
|
Fixed modifier key state setting in GLFW callbacks.
|
2015-04-03 09:01:48 -05:00 |
|
ocornut
|
ed94edfd8e
|
Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
|
2015-03-22 14:14:23 +00:00 |
|
Adam D. Moss
|
c1766c95ed
|
OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
|
2015-03-22 13:49:36 +00:00 |
|
ocornut
|
04358c301e
|
Removed extraneous spaces
|
2015-03-16 11:49:18 +00:00 |
|
Adam D. Moss
|
f2ff88b03a
|
opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it.
|
2015-03-16 10:47:14 +00:00 |
|
ocornut
|
7c9bd71512
|
Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
|
2015-03-14 10:41:42 +00:00 |
|
ocornut
|
0911526424
|
Added io.KeyAlt + support in examples apps
Currently unused but supported by sample so that more people will have
it set up when menus needs them
|
2015-03-13 09:49:38 +00:00 |
|
ocornut
|
d5b7b8398f
|
Examples: reference implementations honors drawlist user callbacks.
|
2015-03-09 15:26:58 +00:00 |
|
ocornut
|
5879f3f5ac
|
Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
|
2015-03-09 15:02:22 +00:00 |
|
ocornut
|
567184dc9f
|
Examples: Clang warning fix.
|
2015-03-09 13:38:23 +00:00 |
|
ocornut
|
b87ec205a9
|
Examples: shallow tweaks to match upcoming other examples.
|
2015-03-09 13:02:32 +00:00 |
|
ocornut
|
b227b0f8cd
|
Examples: Rename globals again
|
2015-03-09 12:16:29 +00:00 |
|
ocornut
|
99ed567577
|
Examples: Rename global to be more consistent
|
2015-03-09 12:02:34 +00:00 |
|
ocornut
|
d829852391
|
Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
|
2015-03-09 11:59:23 +00:00 |
|