Commit Graph

27 Commits (b30d08d63a97eab14e89cd90462179e01c1871ec)

Author SHA1 Message Date
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. ()
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it ()
ocornut 4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
Dale Kim ac518a1d3e Set modifier key state by inspecting imgui's io.KeysDown array.
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
ocornut 71429d306e Examples: Simplified GLFW keyboard callbacks
ocornut c735d3066b Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
Dale Kim fe15756129 Simplified glfw keyboard callbacks.
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
ocornut 73e2d56acc Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
Dale Kim 4b7be31197 Fixed modifier key state setting in GLFW callbacks.
ocornut ed94edfd8e Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
Adam D. Moss c1766c95ed OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
ocornut 04358c301e Removed extraneous spaces
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.
ocornut 7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
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
ocornut d5b7b8398f Examples: reference implementations honors drawlist user callbacks.
ocornut 5879f3f5ac Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
ocornut 2dd92e3eed Examples: Clang/Linux warning fixes.
ocornut b87ec205a9 Examples: shallow tweaks to match upcoming other examples.
ocornut b227b0f8cd Examples: Rename globals again
ocornut 99ed567577 Examples: Rename global to be more consistent
ocornut d829852391 Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
ocornut 545a57d253 Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
Other examples will follow.