Commit Graph

1655 Commits (0c9fcdbe71e0bddb368a6de88e7918cba5c3fb7b)
 

Author SHA1 Message Date
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
omar 7c9739c67f Merge pull request from heroboy/patch-1
Examples: DirectX9: Set shaders to NULL to enforce using fixed pipeline.
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.
ocornut 6e4d3dac1a Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc
omar a8a5ba9d1e Update README.txt
omar 46769406dc Update README.txt
ocornut c38c54af52 Clicking on void loses keyboard-focus so application can use TAB back
ocornut fe64da6197 Allow SetWindowFocus(NULL) to remove focus
ocornut 73e2d56acc Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
ocornut f5310a2f2d Comments
ocornut 28a45877aa DragFloat() comment examples, not ready for prime-time
ocornut c93f34238e DragFloat() examples
ocornut 962aa4c396 DragFloat() double-clicking turns into an input box (along with Ctrl+clicking)
ocornut 916a8955ec DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound , removed extra APIs
ocornut 61d886e14b SliderFloat() removed support for unbound/infinite slider, inconsistent. Use InputFloat()/DragFloat()
Dale Kim 4b7be31197 Fixed modifier key state setting in GLFW callbacks.
ocornut aac99819d6 Selectable() render into AutoFitPadding but do not extend it, fixing small visual gap
Followup 2e26196aba /  
ocornut f3967f1183 Combo() adding frame padding inside the combo box.
ocornut dc52938627 InputInt2(), InputInt3(), InputInt4(): fixed label vertical alignment
ocornut f7e35ce120 ShowTestWindow() renamed sliders examples to say "slider"