ocornut
|
8e353af1d3
|
Renamed ImGuiWindowFlags_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar (#476)
|
2016-04-03 23:28:05 +02:00 |
|
ocornut
|
26be1511e9
|
Merge branch 'Loftilus-master'
|
2016-04-03 17:43:40 +02:00 |
|
ocornut
|
c1427de5b6
|
Examples: Libs: Update glfw binaries to glfw master.
|
2016-04-03 17:41:59 +02:00 |
|
ocornut
|
0e7b9b8284
|
Examples: Vulkan: Coding style tweaks.
|
2016-04-03 17:32:53 +02:00 |
|
ocornut
|
9c513d4443
|
Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
|
2016-04-03 16:42:56 +02:00 |
|
ocornut
|
f45fd1cef6
|
Comments
|
2016-04-03 16:42:35 +02:00 |
|
ocornut
|
552246feed
|
Examples: DirectX10,DirectX11 : Minor renaming
|
2016-04-03 13:02:04 +02:00 |
|
ocornut
|
518f32ccfe
|
Examples: DirectX10: Save/restore state + minor cleanups (#570)
|
2016-04-03 12:59:56 +02:00 |
|
ocornut
|
90493f8add
|
Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570)
|
2016-04-03 12:48:38 +02:00 |
|
ocornut
|
726b91a2cd
|
Merge branch 'nlguillemot-patch-1'
|
2016-04-03 12:43:43 +02:00 |
|
ocornut
|
2942240072
|
Examples: DX11: Cleanup state backup/restore code (#570)
|
2016-04-03 12:43:17 +02:00 |
|
Nicolas Guillemot
|
d4d51a7802
|
capture and restore all state
|
2016-04-02 19:08:27 -07:00 |
|
ocornut
|
4c1d4233b2
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-04-03 01:10:26 +02:00 |
|
ocornut
|
650515ce49
|
Updated todo list and comments
|
2016-04-03 01:07:11 +02:00 |
|
ocornut
|
d53c308852
|
Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
|
2016-04-03 00:47:41 +02:00 |
|
ocornut
|
1eacfd120b
|
Update README.md
|
2016-04-03 00:26:00 +02:00 |
|
ocornut
|
c61e08e8c4
|
InputText: move to next word OS X style behavior on OS X (#473)
|
2016-04-02 22:06:47 +02:00 |
|
ocornut
|
aeaf5ccebb
|
stb_textedit.h: proposal for upstream PR to allow custom move-left/move-right handlers (following #473)
|
2016-04-02 21:20:41 +02:00 |
|
ocornut
|
9945eecaf4
|
stb_truetype: updated 1.08 > 1.10 + minor unused variable warning fix
|
2016-04-02 20:12:20 +02:00 |
|
ocornut
|
c3376cd45c
|
stb_textedit.h Local warning fixes
|
2016-04-02 20:08:42 +02:00 |
|
ocornut
|
e7b95646b9
|
stb_textedit.h updated to 1.8 (our two main changes were merged now)
|
2016-04-02 20:08:11 +02:00 |
|
ocornut
|
f48fc51777
|
IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior (#473)
|
2016-04-02 18:58:42 +02:00 |
|
ocornut
|
aa7a29cdbf
|
InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior (#473)
|
2016-04-02 18:57:50 +02:00 |
|
ocornut
|
587fc60f25
|
InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior (#473)
|
2016-04-02 18:57:08 +02:00 |
|
ocornut
|
a6399f120f
|
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) (#473)
NB: Value not used.
|
2016-04-02 18:22:40 +02:00 |
|
omar
|
171b0e5ca9
|
Update README.md
|
2016-03-30 16:30:17 +02:00 |
|
ocornut
|
ae0c33c983
|
Examples: Links
|
2016-03-29 11:33:23 +02:00 |
|
ocornut
|
9e817a7c38
|
ColorPicker3/4: Fixed missing ID scoping (#346)
|
2016-03-28 23:45:23 +02:00 |
|
ocornut
|
6a241d4895
|
ColorPicker3: Fixed
|
2016-03-28 23:38:04 +02:00 |
|
ocornut
|
326c4e40f8
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-28 23:17:13 +02:00 |
|
omar
|
41c5d4651b
|
Update README.md
|
2016-03-27 12:04:17 +02:00 |
|
omar
|
c4876078b4
|
Update README.md
|
2016-03-27 11:43:12 +02:00 |
|
ocornut
|
cfbf06e394
|
Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
|
2016-03-27 10:38:14 +02:00 |
|
omar
|
39c9bb73e8
|
Merge pull request #563 from mneumann/fix_dragonfly
Fix compilation on DragonFly BSD
|
2016-03-26 16:40:00 +01:00 |
|
ocornut
|
7661b1e778
|
Trim trailing spaces
|
2016-03-26 15:43:45 +01:00 |
|
ocornut
|
2b7eeba143
|
Trim trailing spaces
|
2016-03-26 15:38:52 +01:00 |
|
ocornut
|
d6750c87c2
|
Combo: display popup above if there's isn't enough space below / or select largest side (#505)
|
2016-03-25 23:36:43 +01:00 |
|
ocornut
|
7c9fa59329
|
Combo: Right-most button stays highlight when popup is open.
|
2016-03-25 22:55:45 +01:00 |
|
ocornut
|
c71aae08f3
|
Merge branch 'brushfiregames-master'
|
2016-03-25 22:28:19 +01:00 |
|
ocornut
|
fdc4299c6c
|
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
|
2016-03-25 22:27:43 +01:00 |
|
ocornut
|
e6c2c1fcfd
|
Examples: SDL: Minor fixes to follow syntax of other examples (#495)
|
2016-03-25 22:25:20 +01:00 |
|
Nick Gravelyn
|
8a61c0afea
|
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
|
2016-03-25 22:20:57 +01:00 |
|
Nick Gravelyn
|
a9b0abe493
|
Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window.
|
2016-03-25 22:19:07 +01:00 |
|
ocornut
|
aecf5d12e6
|
DragFloat(), SliderFloat(), InputFloat(): fixed cases of erroneously returning true repeatedly after a text input modification (#564)
|
2016-03-25 21:53:59 +01:00 |
|
Michael Neumann
|
adb4d4d48b
|
Fix compilation on DragonFly BSD
|
2016-03-24 19:37:11 +01:00 |
|
ocornut
|
5b8aa0dc84
|
FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475)
|
2016-03-24 11:06:57 +01:00 |
|
ocornut
|
04396ed7a9
|
FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...)
|
2016-03-24 11:00:47 +01:00 |
|
ocornut
|
d39029f3a8
|
Branch fix
|
2016-03-23 10:51:40 +01:00 |
|
ocornut
|
baabe3b62c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-23 10:50:37 +01:00 |
|
ocornut
|
367c53967f
|
Metrics: inspect individual triangles in drawcall
|
2016-03-22 21:17:24 +01:00 |
|