ocornut
|
0449bb98e2
|
Merge branch 'master' of https://github.com/martty/imgui into martty-master
|
2016-11-12 17:36:46 +01:00 |
|
ocornut
|
98e1d500d4
|
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery (#586)
|
2016-11-12 17:08:31 +01:00 |
|
ocornut
|
e0aef0018f
|
Updated README
|
2016-11-12 16:08:26 +01:00 |
|
ocornut
|
a68ac96bc4
|
Examples: GL3: Comments about gl3w (#880)
|
2016-11-12 12:48:33 +01:00 |
|
ocornut
|
775ac24d45
|
Fixed overzealous GCC warnings (#883) + partly undo 8553bab241
|
2016-11-12 11:14:37 +01:00 |
|
omar
|
89d033aba3
|
Merge pull request #898 from tinnnysu/master
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
|
2016-11-12 11:08:51 +01:00 |
|
ocornut
|
379533f661
|
Updated stb_truetype.h, stb_rect_pack.h primarily to reduce warnings (#883)
|
2016-11-11 20:19:07 +01:00 |
|
ocornut
|
8553bab241
|
Ignoring overzealous GCC warnings (#883)
|
2016-11-11 20:17:35 +01:00 |
|
ocornut
|
81eefb704b
|
Minor const fixes for overzealous warnings (#883)
|
2016-11-11 18:40:13 +01:00 |
|
ocornut
|
ccb3db94da
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-11-09 15:17:20 +01:00 |
|
sushitao
|
833ed760ae
|
update cmdline syntax in windows compilation
|
2016-11-09 14:53:23 +08:00 |
|
ocornut
|
faafcf418d
|
Demo: Comments, even though nobody appears to read the comments.
|
2016-11-07 17:33:46 +01:00 |
|
ocornut
|
3689efb726
|
Font: Readme about icons
|
2016-11-06 22:53:36 +01:00 |
|
ocornut
|
da9feba539
|
Fixed missing frame padding on title bar text when Collapse triangle is disabled
|
2016-11-06 22:40:47 +01:00 |
|
ocornut
|
620497e466
|
Font: Font name include size
|
2016-11-06 22:21:21 +01:00 |
|
ocornut
|
84f480a638
|
Font: Added Roboto-Medium + tweaked readme
|
2016-11-06 22:21:10 +01:00 |
|
ocornut
|
b2f0ea6c0d
|
Font: Default font given explicit name "ProggyClean.ttf"
|
2016-11-06 21:51:20 +01:00 |
|
ocornut
|
b376b68326
|
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
|
2016-11-06 21:50:18 +01:00 |
|
ocornut
|
357167f917
|
Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.
|
2016-11-06 18:13:14 +01:00 |
|
ocornut
|
907dd2ed20
|
Comments (#896)
|
2016-11-06 15:25:28 +01:00 |
|
ocornut
|
ddf08ec2e8
|
BeginChild(const char*) applies stack id to provided label (#894, #713)
|
2016-11-06 15:12:50 +01:00 |
|
Matt Keeter
|
32dbe836d0
|
Add user-facing IsPopupOpen function
|
2016-10-29 15:33:09 -04:00 |
|
Marcell Kiss
|
53126cd713
|
Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)
|
2016-10-18 22:43:20 +02:00 |
|
Marcell Kiss
|
44250caf50
|
Null the released resources
|
2016-10-18 22:07:51 +02:00 |
|
omar
|
43e6c46c8d
|
Merge pull request #877 from Velro/patch-1
Demo: Outdated dragging API mentioned in demo text
|
2016-10-16 18:32:13 +02:00 |
|
James Fulop
|
6fa3aaf7c0
|
outdated dragging API mentioned in demo text
Looks like you changed the API on dragging, but did not update the description text for it.
https://github.com/ocornut/imgui/issues/167
|
2016-10-16 12:21:38 -04:00 |
|
ocornut
|
dd6163241c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-10-16 14:02:15 +02:00 |
|
ocornut
|
b3790e7549
|
InputText: Fixed pressing home key on last character when it isn't a trailing \n (#588, #815)
|
2016-10-16 13:34:47 +02:00 |
|
ocornut
|
7252d93dcd
|
stb_textedit.h Merged from master 1.9 (merged bits from #473)
|
2016-10-16 11:34:33 +02:00 |
|
ocornut
|
0d3f8807c7
|
Added a void* user_data parameter to Clipboard function handlers. (#875)
|
2016-10-15 11:36:43 +02:00 |
|
ocornut
|
d649bc485b
|
Minor comments
|
2016-10-15 11:18:29 +02:00 |
|
ocornut
|
cb7e1c18b5
|
Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle (#860)
|
2016-10-10 22:37:59 +02:00 |
|
ocornut
|
31dc7d8d63
|
Added ImGuiMouseCursor_None for usage by app/binding
|
2016-10-10 18:03:37 +02:00 |
|
ocornut
|
4de35b4f30
|
Removed left-over empty op
|
2016-10-09 10:58:38 +02:00 |
|
ocornut
|
1810b3ff38
|
Added ImGuiCorner enum to clarify some internal code
|
2016-10-09 10:56:23 +02:00 |
|
ocornut
|
d567595dde
|
ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions
|
2016-10-09 10:35:01 +02:00 |
|
ocornut
|
abaada4224
|
Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
|
2016-10-09 10:31:39 +02:00 |
|
ocornut
|
5957af8a80
|
Fixed not using IM_ARRAYSIZE() where appropriate
|
2016-10-09 10:08:03 +02:00 |
|
ocornut
|
fa73e5aa0e
|
Plot: Fixed calling with values_count == 0
|
2016-10-08 12:43:30 +02:00 |
|
ocornut
|
51111b0ed5
|
FAQ clarified the ClipRect entry a little
|
2016-10-07 10:27:19 +02:00 |
|
ocornut
|
404979e48d
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-10-07 09:52:00 +02:00 |
|
ocornut
|
e07d45709f
|
ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing (#844)
|
2016-10-07 09:49:52 +02:00 |
|
omar
|
7995cabce5
|
Merge pull request #864 from jslee02/fix-clang-unknown-warning
Fix clang warning for old Clang versions: unknown warning group '-Wreserved-id-macro'
|
2016-10-06 21:48:00 +02:00 |
|
Jeongseok Lee
|
1d7e05327b
|
Fix clang warning: unknown warning group '-Wreserved-id-macro'
|
2016-10-06 14:48:47 -04:00 |
|
ocornut
|
05b580e691
|
Tools: Fixed binary_to_compressed_c.cpp not to use different types on both sides of ternary op (#856)
|
2016-10-02 17:25:09 +02:00 |
|
ocornut
|
a2487bc143
|
Minor tweaks
|
2016-10-01 15:16:17 +02:00 |
|
ocornut
|
9896faf731
|
Merge branch 'madeso-master'
|
2016-10-01 15:00:00 +02:00 |
|
ocornut
|
2919c77bee
|
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called (#800)
|
2016-10-01 14:59:28 +02:00 |
|
ocornut
|
b96471143f
|
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
|
2016-10-01 14:56:24 +02:00 |
|
ocornut
|
28974dfbbb
|
Merge branch 'thedmd-2016-08-use_bgra_colors'
|
2016-10-01 14:29:27 +02:00 |
|