omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2018-05-07 22:23:58 +02:00 |
|
omar
|
4310bad32a
|
Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h (#1790, #1687)
|
2018-05-07 11:52:48 +02:00 |
|
SR_team
|
d0051ce5cb
|
add renderstate D3DRS_SHADEMODE for Dx9 impl
add backuping transform for Dx9 impl
(#1790, #1687)
|
2018-05-07 11:52:48 +02:00 |
|
omar
|
eb1c36fdfb
|
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695, #1769)
|
2018-04-25 22:07:14 +02:00 |
|
daniel-murray
|
83d97d4a9b
|
Fix typos KeyDown => KeysDown
|
2018-04-14 10:28:10 +02:00 |
|
omar
|
56ad2a2d74
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
|
2018-04-09 19:35:14 +02:00 |
|
omar
|
660c157880
|
Examples: Added missing calls for ::DestroyWindow, glfwDestroyWindow() + fix old comments.
|
2018-04-09 19:16:47 +02:00 |
|
omar
|
72b7f48870
|
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
|
2018-04-06 18:12:21 +02:00 |
|
omar
|
664ab85f76
|
Examples: Tweak comments. (#1704, #1708).
|
2018-04-02 17:31:51 +02:00 |
|
omar
|
ca39070ca0
|
Examples: Win32: Fixes for MingW which doesn't support a 2007 define? I have no idea why people still use MingW (#1704, #1463)
|
2018-03-28 23:32:02 +02:00 |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
2018-03-20 21:19:23 +01:00 |
|
omar
|
170f44e6f0
|
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787)
|
2018-03-20 20:12:34 +01:00 |
|
omar
|
19b92751b9
|
Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.
|
2018-03-07 12:05:47 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 19:03:39 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
bcdfd5d61c
|
Merge branch 'master' into examples_refactor
|
2018-02-20 16:18:02 +01:00 |
|
omar
|
7e2e0535dd
|
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495)
|
2018-02-20 13:55:09 +01:00 |
|
omar
|
4f0db01f7c
|
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
63332d152a
|
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599)
Examples: Updated examples.
|
2018-02-16 19:18:16 +01:00 |
|
omar
|
7cc1bc7635
|
Added IsAnyMouseDown() helper.
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
|
2018-02-10 16:50:19 +01:00 |
|
omar
|
f0364aa359
|
Merge branch 'context'
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
2018-02-06 20:16:03 +01:00 |
|
omar
|
ae30efc0fd
|
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787)
|
2018-02-06 19:58:23 +01:00 |
|
omar
|
057807f4a7
|
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787)
|
2018-02-06 19:29:31 +01:00 |
|
omar
|
73d493c780
|
Examples: Organized header files to make available features more visible.
|
2018-02-05 20:34:11 +01:00 |
|
omar
|
27980d9688
|
Merge branch 'master' into context
|
2018-01-31 16:02:26 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +01:00 |
|
omar
|
6a25a8720a
|
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
|
2018-01-29 14:38:46 +01:00 |
|
omar
|
f3776055d6
|
Merge branch 'master' into context
|
2018-01-24 19:31:11 +01:00 |
|
omar
|
c2e92ab61b
|
Added imgui.natvis helper for visual studio users. Added to examples projects.
|
2018-01-24 18:40:54 +01:00 |
|
omar
|
dd89c9ea59
|
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. (#1565)
|
2018-01-21 20:58:50 +01:00 |
|
omar
|
d3e826c247
|
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558)
|
2018-01-21 20:16:55 +01:00 |
|
omar
|
7dea158175
|
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463)
|
2018-01-20 12:36:59 +01:00 |
|
omar
|
ce95b84825
|
Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541)
|
2018-01-08 15:30:39 +01:00 |
|
omar
|
3d24a9eb40
|
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538)
|
2018-01-05 22:32:27 +01:00 |
|
Nick Dandoulakis
|
20ae6439ea
|
CS_DBLCLKS support for Directx9
|
2018-01-05 22:16:35 +02:00 |
|
omar
|
4c90529c62
|
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
|
2018-01-04 11:42:05 +01:00 |
|
omar
|
ce13426a1a
|
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
|
2017-12-24 18:45:11 +01:00 |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
2017-12-24 18:16:22 +01:00 |
|
omar
|
b263bc5689
|
Examples: DirectX: Using IM_ARRAYSIZE()
|
2017-12-23 14:07:27 +01:00 |
|
omar
|
c8b5b569da
|
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
|
2017-11-28 11:26:14 +01:00 |
|
omar
|
e000ee0116
|
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). (#1464)
|
2017-11-28 10:48:01 +01:00 |
|
Codecat
|
979fe30a6f
|
Fix wrong comment in dx implementation headers
|
2017-11-18 13:56:59 +01:00 |
|
omar
|
fba704bf5d
|
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (#1262, #1237, #1219, #635, #1058, #1051, #912, #533, #703, #446, #459, #364, #213, #52, and more)
|
2017-11-01 14:24:09 +01:00 |
|
omar
|
cb38caeda4
|
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397, #1366, #1341, #1222, #1193, #1115, #951, etc.)
|
2017-10-28 18:21:44 +02:00 |
|
omar
|
d2c65aa3e8
|
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. (#1375)
ps: DirectX 12 example (#302) may want to adopt that as well.
|
2017-10-24 14:48:00 +02:00 |
|
omar
|
d6a9956781
|
Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
|
2017-10-23 10:01:18 +02:00 |
|
omar
|
c14a66970b
|
Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
|
2017-10-23 09:57:59 +02:00 |
|
omar
|
3e0765ee22
|
Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior (#1375)
|
2017-10-23 09:43:30 +02:00 |
|