121 Commits (d0876713690f834ea8c3c6e44f193d416523761f)

Author SHA1 Message Date
ocornut 963f6b782d Examples: OpenGL3: saving more of blend state (#347) 9 years ago
ocornut d5502cdd6d Examples: OpenGL3: Saving/restoring the Enable state, better than nothing (#347) 9 years ago
ocornut ad4c962224 Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters... 9 years ago
ocornut 853f265025 Examples: Added batch files to build Windows examples with VS 9 years ago
ocornut 1793c1a991 Comments 9 years ago
ocornut 7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function. 9 years ago
ocornut 0bb46c824e Examples: OpenGL2/3: save/restore some more state correctly.
Might save an hour of staring at blank-screen to 5% of the population,
worth it.
9 years ago
ocornut da807e55ea Examples: Ignore list a little more friendly to Unix systems. 9 years ago
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287) 9 years ago
ocornut 9a0650dbd0 Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL 9 years ago
ocornut 23ce837dc7 Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279)"
This reverts commit d80869189a.
9 years ago
ocornut d80869189a Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279) 9 years ago
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments 9 years ago
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions 9 years ago
ocornut 52a74701f5 Updated projects to reference new files (#219)
Didn't update iOS example (#247)
9 years ago
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278) 9 years ago
ocornut dc1cb9e625 Tweak 9 years ago
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ocornut/imgui#277). 9 years ago
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf 9 years ago
ocornut 0224d29a35 Examples: comments. 9 years ago
ocornut fcec337061 Examples: Simplified font examples comments. 9 years ago
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264) 9 years ago
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 9 years ago
ocornut 25882c47a3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
9 years ago
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
9 years ago
ocornut 6a22835f63 AA branch: ImDrawList: rename commands to cmd_buffer
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
9 years ago
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 9 years ago
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 9 years ago
ocornut 61e551e0ee AA branch: fixed warning 9 years ago
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
9 years ago
ocornut 7437b43b2d Fixed warnings for more pedantic settings (#258) 9 years ago
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user. 9 years ago
ocornut 71e9f2a3dd Fixed warnings for 64-bits builds 9 years ago
ocornut e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
10 years ago
Gordon McShane 6ee65fc5af Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX 10 years ago
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
10 years ago
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. (#224) 10 years ago
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 10 years ago
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155) 10 years ago
ocornut 4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
10 years ago
ocornut f400ea4ec8 Examples: OpenGL3: backup/restore current program and texture #195 10 years ago
Dale Kim ac518a1d3e Set modifier key state by inspecting imgui's io.KeysDown array. 10 years ago
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
10 years ago
ocornut 71429d306e Examples: Simplified GLFW keyboard callbacks 10 years ago
ocornut c735d3066b Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master 10 years ago
Dale Kim fe15756129 Simplified glfw keyboard callbacks. 10 years ago
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
10 years ago
ocornut 4f51b77937 Examples: OpenGL3: Tweaks (argh, github ui) 10 years ago
ocornut 90766141b3 Examples: OpenGL3: Tweaks. 10 years ago