omar
5418bb19ff
Examples: Vulkan: windows batch file for 64-bits.
2017-05-01 16:14:13 +02:00
omar
497381dc3d
Comments
2017-05-01 15:53:50 +02:00
omar
23e7cdcee8
Merge branch 'martty-vk_small_fix'
2017-05-01 15:27:05 +02:00
omar
ac2eb4b960
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
2017-05-01 15:26:29 +02:00
omar
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
2017-05-01 15:00:42 +02:00
omar
475446b8b9
Merge pull request #1080 from SaschaWillems/master
...
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
2017-05-01 14:50:34 +02:00
omar
b3d237a5ce
Examples: SDL2: Added build .bat files for win32.
2017-05-01 13:47:59 +02:00
omar
dbfd5d6e9a
Ignoring unreasonnable Clang -wformat-pedantic warning ( #1090 )
...
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
2017-05-01 12:55:47 +02:00
omar
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
omar
89b1497843
Merge branch 'master' into 2016-02-colorpicker
2017-05-01 12:37:34 +02:00
omar
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
2017-05-01 12:36:46 +02:00
omar
7cd55ce939
Merge branch 'ecraven-addimagequad'
2017-05-01 12:34:45 +02:00
omar
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
2017-05-01 12:34:32 +02:00
omar
f06b20185f
Merge branch 'addimagequad' of https://github.com/ecraven/imgui into ecraven-addimagequad
2017-05-01 12:25:25 +02:00
omar
884c435fd3
Merge branch 'greggman-fix-opengl3-example'
2017-05-01 12:21:05 +02:00
omar
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
2017-05-01 12:20:51 +02:00
Gregg Tavares
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
omar
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
2017-04-30 12:10:45 +02:00
omar
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
2017-04-30 12:10:45 +02:00
omar
a606f2dcb5
Update README.md
2017-04-28 13:43:11 +02:00
omar
9ab9a846a1
Update README.md
2017-04-28 13:40:50 +02:00
omar
6e69923e35
Update README.md
2017-04-28 13:32:04 +02:00
omar
32390a252f
Added UnrealEngine_ImGui link
2017-04-28 10:28:52 +02:00
Peter
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
2017-04-28 10:04:20 +02:00
omar
104936ab1a
imconfig: Added comment about redefining ImDrawIdx
2017-04-26 19:12:46 +02:00
omar
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
2017-04-26 18:27:10 +02:00
omar
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
Michael Link
8df58e2cfd
MenuItem should only be selected on release
2017-04-25 15:15:56 +02:00
omar
670775ac22
Added assert/comment about using MergeMode ( #1100 )
2017-04-13 20:01:24 +02:00
omar
15d7f20d4f
Update README.md
2017-04-01 18:44:34 +02:00
omar
0e1950f7d6
Comments about child menu positioning ( #1086 )
2017-04-01 18:01:47 +02:00
omar
4b125e7d5c
Merge pull request #1078 from nem0/master
...
Added missing IMGUI_API macros in ImGuiTextEditCallbackData methods.
2017-03-29 14:51:26 +02:00
saschawillems
4da26d85cd
Clip negative scissor offsets to zero
2017-03-26 19:54:59 +02:00
saschawillems
12deb53b11
Set required depth member for buffer image copy
2017-03-26 19:38:05 +02:00
Mikulas Florek
7a37a1c3f6
do not export inline function, it causes problems on some compiers
2017-03-24 12:45:09 +01:00
Mikulas Florek
316555f9de
missing API
2017-03-24 10:10:22 +01:00
omar
288dccd5a5
Merge branch 'master' into 2016-07-navigation
2017-03-17 21:30:16 +01:00
omar
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
2017-03-17 21:29:57 +01:00
omar
b84eac53d8
ImFont: Reorder field initialization to match declaration order
2017-03-17 21:29:28 +01:00
omar
931bc61345
Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()
2017-03-16 21:55:36 +01:00
omar
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
2017-03-16 19:31:12 +01:00
omar
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
2017-03-16 19:28:30 +01:00
omar
9a068ce005
Merge pull request #1068 from codecat/fix-colorbutton
...
ColorButton: fix showing wrong hex value for alpha in tooltip.
2017-03-16 09:51:04 +01:00
Codecat
fdd11658eb
Fix ColorButton showing wrong hex value for alpha
2017-03-15 21:25:29 +01:00
Jefferson Montgomery
30954b4a88
Merge latest from ocornut/imgui
2017-03-13 13:26:55 -07:00
Peter Particle
337019a68f
typo, #elif instead of #else, fixed
2017-02-26 17:16:37 +01:00
Peter Particle
fd90da38e1
Vulkan backend: g_FrameIndex not used fix -> huge perf gain
...
Added a macro to switch between unlimited frame rate (VK_PRESENT_MODE_IMMEDIATE_KHR) and limited to 60 fps (VK_PRESENT_MODE_FIFO_KHR). Only the latter mode is guaranteed to be available, but the former one most likely is.
2017-02-26 13:25:54 +01:00
Marcell Kiss
e0244c8f62
Fix scissor offset being negative
2017-02-11 12:20:12 +01:00
Marcell Kiss
509df3e279
Fix new Vulkan validation warnings
2017-02-11 12:19:44 +01:00
omar
6384eee34f
Minor comments ( #998 )
2017-01-29 16:53:01 +01:00
