Commit Graph

5574 Commits (9ad4c5da7e2806f47fb08cbfa050b1ed3e768fbe)
 

Author SHA1 Message Date
ocornut f5ad362912 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works
ocornut 0dc3d07e7f DragInt() step given as float to allow finer control of speed
ocornut 62abde5b37 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works
ocornut b308d2728b Remove stray tabs
ocornut adae98664e Comment on the newly added binary_to_compressed_c.cpp helper program
ocornut 88725be381 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 7ca21a1bc2 Fixed prototypes
ocornut ac740170b9 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
ocornut bff9a6b6e3 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
ocornut d809abbe1c Examples: DirectX11: tidying up.
ocornut c3a71f5472 AA branch: Minor optimisation merge + thickness for non-aa strokes.
ocornut dbc9b2ec9b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 6bdb8719e2 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
ocornut a48130b682 ImDrawList: Minor optimisation.
ocornut e0cd947904 AA branch: Fixes.
ocornut 1e69175403 AA branch: Test disabling aa at runtime for stroke and fill.
ocornut 431e391ccd AA branch: fixed circles.
ocornut dd893ac4f5 Warning fix.
ocornut 14ddb81f7a AA branch: remove code unnecessary for this branch.
ocornut 39445cf23a Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
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
ocornut 4f51b77937 Examples: OpenGL3: Tweaks (argh, github ui)
ocornut 90766141b3 Examples: OpenGL3: Tweaks.
ocornut 37f1715bfa Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
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
ocornut 500a8a0e02 ImDrawList: bits of renaming.
ocornut 4fa3eee84e Renamed io.MetricsVertices to io.MetricsRenderVertices
ocornut aa1a96f907 ImDrawList: inline AddVtx() calls for profit in highly debug builds
ocornut 334fba2f56 Spacing
ocornut 707df6c7b7 ImDrawList: internal refactoring toward a following commit for indexed rendering.
ocornut 742808d835 Tweaks.
ocornut 15f82e0deb Fix rounded frames to follow previous change
ocornut aa2935968e Renamed AddArcFast() parameter 'tris' to 'filled'
ocornut f38cca09cf Merge branch 'master' of https://github.com/ocornut/imgui
ocornut 0fc1f5b17f Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
omar ae1166a783 Merge pull request from Extrawurst/patch-2
Fixed unused variable warning.
Stephan Dilly 2bb6e31520 fix unused variable warning by clang
ocornut 200d3482dc Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
omar 71cfa264d7 Merge pull request from Extrawurst/patch-1
Fix initialising ints with float literals
Stephan Dilly 5ba77928ba fix initialising ints with float literals
ocornut 13fab08cdb Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
omar b9dd7c65ab Update README.md
ocornut 241ccb46d5 Update README.txt + screenshot
ocornut 3c6257b8b9 Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52)
ocornut 6e99688fa7 Fixed user-facing version of IsItemHovered() ignoring overlapping windows
ocornut 323ae8326e Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut d692286862 Added ShowMetricsWindow()
ocornut 8211081c54 Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing.
ocornut 33ef3992f7 Added IO.MetricsVertices counter
ocornut d9ff617ff8 Examples: Formatting