ocornut
|
e9b6e437eb
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
imgui.h
|
2015-05-15 17:33:04 +01:00 |
|
ocornut
|
5df542c3c0
|
ImFontAtlas: doesn't clear input data, left to the application. (#224)
|
2015-05-12 15:16:12 +01:00 |
|
ocornut
|
f00662a5ad
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
2015-05-02 22:20:48 +01:00 |
|
ocornut
|
ad7f600e0d
|
Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155)
|
2015-05-01 11:25:15 +02:00 |
|
ocornut
|
4f1acf0d4a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
|
2015-04-17 08:42:36 +01:00 |
|
Dale Kim
|
ac518a1d3e
|
Set modifier key state by inspecting imgui's io.KeysDown array.
|
2015-04-14 14:09:26 -05:00 |
|
ocornut
|
43cb4038c6
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
|
2015-04-14 09:51:28 +01:00 |
|
ocornut
|
71429d306e
|
Examples: Simplified GLFW keyboard callbacks
|
2015-04-14 09:45:27 +01:00 |
|
ocornut
|
c735d3066b
|
Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
|
2015-04-14 09:37:10 +01:00 |
|
Dale Kim
|
fe15756129
|
Simplified glfw keyboard callbacks.
|
2015-04-13 20:04:53 -05: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 |
|
ocornut
|
73e2d56acc
|
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
|
2015-04-06 10:45:10 +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
|
2dd92e3eed
|
Examples: Clang/Linux warning fixes.
|
2015-03-09 13:08:27 +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 |
|
ocornut
|
545a57d253
|
Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
Other examples will follow.
|
2015-03-09 11:25:15 +00:00 |
|