ocornut
|
dbc9b2ec9b
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
2015-04-09 22:56:13 +01:00 |
|
ocornut
|
6bdb8719e2
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
2015-04-09 22:50:18 +01:00 |
|
ocornut
|
a48130b682
|
ImDrawList: Minor optimisation.
|
2015-04-09 22:49:18 +01:00 |
|
ocornut
|
e0cd947904
|
AA branch: Fixes.
|
2015-04-09 22:40:50 +01:00 |
|
ocornut
|
1e69175403
|
AA branch: Test disabling aa at runtime for stroke and fill.
|
2015-04-09 22:31:26 +01:00 |
|
ocornut
|
431e391ccd
|
AA branch: fixed circles.
|
2015-04-09 21:51:33 +01:00 |
|
ocornut
|
dd893ac4f5
|
Warning fix.
|
2015-04-09 21:43:42 +01:00 |
|
ocornut
|
14ddb81f7a
|
AA branch: remove code unnecessary for this branch.
|
2015-04-09 21:39:56 +01:00 |
|
ocornut
|
39445cf23a
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
imgui.h
|
2015-04-09 21:38:30 +01:00 |
|
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
|
2015-04-09 21:22:06 +01:00 |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
2015-04-09 21:19:21 +01:00 |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
2015-04-09 21:18:43 +01:00 |
|
ocornut
|
37f1715bfa
|
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
|
2015-04-09 21:14:52 +01:00 |
|
ocornut
|
1746b04065
|
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
|
2015-04-09 21:05:35 +01:00 |
|
ocornut
|
500a8a0e02
|
ImDrawList: bits of renaming.
|
2015-04-09 21:00:45 +01:00 |
|
ocornut
|
4fa3eee84e
|
Renamed io.MetricsVertices to io.MetricsRenderVertices
|
2015-04-09 19:47:41 +01:00 |
|
ocornut
|
aa1a96f907
|
ImDrawList: inline AddVtx() calls for profit in highly debug builds
|
2015-04-09 18:34:31 +01:00 |
|
ocornut
|
334fba2f56
|
Spacing
|
2015-04-09 17:33:17 +01:00 |
|
ocornut
|
707df6c7b7
|
ImDrawList: internal refactoring toward a following commit for indexed rendering.
|
2015-04-09 17:32:03 +01:00 |
|
ocornut
|
742808d835
|
Tweaks.
|
2015-04-09 17:24:09 +01:00 |
|
ocornut
|
15f82e0deb
|
Fix rounded frames to follow previous change
|
2015-04-09 17:20:57 +01:00 |
|
ocornut
|
aa2935968e
|
Renamed AddArcFast() parameter 'tris' to 'filled'
|
2015-04-09 16:47:20 +01:00 |
|
ocornut
|
f38cca09cf
|
Merge branch 'master' of https://github.com/ocornut/imgui
|
2015-04-09 16:45:21 +01:00 |
|
ocornut
|
0fc1f5b17f
|
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
|
2015-04-09 16:45:14 +01:00 |
|
omar
|
ae1166a783
|
Merge pull request #191 from Extrawurst/patch-2
Fixed unused variable warning.
|
2015-04-09 15:59:43 +01:00 |
|
Stephan Dilly
|
2bb6e31520
|
fix unused variable warning by clang
|
2015-04-09 16:50:54 +02:00 |
|
ocornut
|
200d3482dc
|
Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
|
2015-04-09 00:49:21 +01:00 |
|
omar
|
71cfa264d7
|
Merge pull request #188 from Extrawurst/patch-1
Fix initialising ints with float literals
|
2015-04-08 22:58:34 +01:00 |
|
Stephan Dilly
|
5ba77928ba
|
fix initialising ints with float literals
|
2015-04-08 22:56:25 +02:00 |
|
ocornut
|
13fab08cdb
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
2015-04-08 20:37:18 +01:00 |
|
omar
|
b9dd7c65ab
|
Update README.md
|
2015-04-07 20:09:59 +01:00 |
|
ocornut
|
241ccb46d5
|
Update README.txt + screenshot
|
2015-04-07 19:55:32 +01:00 |
|
ocornut
|
3c6257b8b9
|
Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52)
|
2015-04-07 14:04:43 +01:00 |
|
ocornut
|
6e99688fa7
|
Fixed user-facing version of IsItemHovered() ignoring overlapping windows
|
2015-04-07 14:03:17 +01:00 |
|
ocornut
|
323ae8326e
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
2015-04-07 13:51:01 +01:00 |
|
ocornut
|
d692286862
|
Added ShowMetricsWindow()
|
2015-04-07 13:42:35 +01:00 |
|
ocornut
|
8211081c54
|
Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing.
|
2015-04-07 13:37:30 +01:00 |
|
ocornut
|
33ef3992f7
|
Added IO.MetricsVertices counter
|
2015-04-07 13:36:11 +01:00 |
|
ocornut
|
d9ff617ff8
|
Examples: Formatting #187
|
2015-04-07 12:56:52 +01:00 |
|
omar
|
7c9739c67f
|
Merge pull request #187 from heroboy/patch-1
Examples: DirectX9: Set shaders to NULL to enforce using fixed pipeline.
|
2015-04-07 12:55:12 +01:00 |
|
heroboy
|
e09e2cbd28
|
set pixel shader and vertex shader to NULL
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
|
2015-04-07 19:36:58 +08:00 |
|
ocornut
|
6e4d3dac1a
|
Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc
|
2015-04-07 11:54:53 +01:00 |
|
omar
|
a8a5ba9d1e
|
Update README.txt
|
2015-04-07 11:15:18 +01:00 |
|
omar
|
46769406dc
|
Update README.txt
|
2015-04-07 10:59:49 +01:00 |
|
ocornut
|
c38c54af52
|
Clicking on void loses keyboard-focus so application can use TAB back
|
2015-04-06 11:25:07 +01:00 |
|
ocornut
|
fe64da6197
|
Allow SetWindowFocus(NULL) to remove focus
|
2015-04-06 11:19:31 +01:00 |
|
ocornut
|
73e2d56acc
|
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
|
2015-04-06 10:45:10 +01:00 |
|
ocornut
|
f5310a2f2d
|
Comments
|
2015-04-04 19:03:39 +01:00 |
|
ocornut
|
28a45877aa
|
DragFloat() comment examples, not ready for prime-time #180
|
2015-04-03 16:21:24 +01:00 |
|
ocornut
|
c93f34238e
|
DragFloat() examples #180
|
2015-04-03 15:18:12 +01:00 |
|