ocornut
|
88725be381
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
7ca21a1bc2
|
Fixed prototypes
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
ac740170b9
|
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
bff9a6b6e3
|
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
d809abbe1c
|
Examples: DirectX11: tidying up.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
c3a71f5472
|
AA branch: Minor optimisation merge + thickness for non-aa strokes.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
dbc9b2ec9b
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
6bdb8719e2
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
a48130b682
|
ImDrawList: Minor optimisation.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
e0cd947904
|
AA branch: Fixes.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
1e69175403
|
AA branch: Test disabling aa at runtime for stroke and fill.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
431e391ccd
|
AA branch: fixed circles.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
dd893ac4f5
|
Warning fix.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
14ddb81f7a
|
AA branch: remove code unnecessary for this branch.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
39445cf23a
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
imgui.h
|
ago%!(EXTRA string=11 years) |
|
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
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
37f1715bfa
|
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
|
ago%!(EXTRA string=11 years) |
|
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
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
500a8a0e02
|
ImDrawList: bits of renaming.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
4fa3eee84e
|
Renamed io.MetricsVertices to io.MetricsRenderVertices
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
aa1a96f907
|
ImDrawList: inline AddVtx() calls for profit in highly debug builds
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
334fba2f56
|
Spacing
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
707df6c7b7
|
ImDrawList: internal refactoring toward a following commit for indexed rendering.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
742808d835
|
Tweaks.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
15f82e0deb
|
Fix rounded frames to follow previous change
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
aa2935968e
|
Renamed AddArcFast() parameter 'tris' to 'filled'
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
f38cca09cf
|
Merge branch 'master' of https://github.com/ocornut/imgui
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
0fc1f5b17f
|
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
|
ago%!(EXTRA string=11 years) |
omar
|
ae1166a783
|
Merge pull request #191 from Extrawurst/patch-2
Fixed unused variable warning.
|
ago%!(EXTRA string=11 years) |
Stephan Dilly
|
2bb6e31520
|
fix unused variable warning by clang
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
200d3482dc
|
Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
|
ago%!(EXTRA string=11 years) |
|
omar
|
71cfa264d7
|
Merge pull request #188 from Extrawurst/patch-1
Fix initialising ints with float literals
|
ago%!(EXTRA string=11 years) |
|
Stephan Dilly
|
5ba77928ba
|
fix initialising ints with float literals
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
13fab08cdb
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
ago%!(EXTRA string=11 years) |
|
omar
|
b9dd7c65ab
|
Update README.md
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
241ccb46d5
|
Update README.txt + screenshot
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
3c6257b8b9
|
Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52)
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
6e99688fa7
|
Fixed user-facing version of IsItemHovered() ignoring overlapping windows
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
323ae8326e
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
d692286862
|
Added ShowMetricsWindow()
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
8211081c54
|
Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
33ef3992f7
|
Added IO.MetricsVertices counter
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
d9ff617ff8
|
Examples: Formatting #187
|
ago%!(EXTRA string=11 years) |
|
omar
|
7c9739c67f
|
Merge pull request #187 from heroboy/patch-1
Examples: DirectX9: Set shaders to NULL to enforce using fixed pipeline.
|
ago%!(EXTRA string=11 years) |
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.
|
ago%!(EXTRA string=11 years) |
|
ocornut
|
6e4d3dac1a
|
Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc
|
ago%!(EXTRA string=11 years) |
|
omar
|
a8a5ba9d1e
|
Update README.txt
|
ago%!(EXTRA string=11 years) |
|
omar
|
46769406dc
|
Update README.txt
|
ago%!(EXTRA string=11 years) |
