Commit Graph

4451 Commits (d68633398b70cc87789ea16b2f1ca0f41195f612)
 

Author SHA1 Message Date
ocornut 5b053dd350 Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
ocornut 7eca4e2a7f Merge bits
ocornut fbb9113118 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 4565bf9813 Demo: custom rendering example uses AddRectFilledMultiColor()
ocornut 6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
ocornut 7a0004eb86 Revert
ocornut d10d0343b2 Plot() function can take 0.0f for both scale_min/scale_max to calculate scale
ocornut e681937f66 Delete merging artefact that survived for a day
ocornut fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut b67593a4b1 Changed SameLine() parameters from int to float.
ocornut 8094aa78d2 Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
ocornut 827ff970cd InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
ocornut d2701727b9 InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
ocornut f2bed00d80 Examples: README
ocornut 5ab23ab1c0 Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
ocornut 398ef1a212 Comments
ocornut 245cf36522 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 890585cde8 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 08b1dd1035 Version number 1.43 WIP
Bits
ocornut fec09e37ab Disable warnings, undo f4aae6b9ec ( )
omar 7d45c84f21 Merge pull request from Extrawurst/patch-4
Fix minor clang-x64 warnings (fixes )
Stephan Dilly f4aae6b9ec fix minor clang-x64 warnings
fixes 
ocornut 09e8c4ec11 AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control ()
omar d81ba432ec New demo binaries
ocornut e5bea65582 Version number 1.42
ocornut 2f574ef952 Allegro 5 example: converted for indexed rendering.
ocornut 60dd221737 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut bbaaab7537 Allegro 5 example: fixed uv coordinate of non-default texture.
ocornut 4d2d0ce5cd Allegro 5 example: handling of hardware and software mouse cursor rendering.
ocornut 8db229b96f Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
ocornut c58d61dfd1 Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
ocornut 489e28ec11 Allegro 5 example: main.cpp matches other examples. added window title.
ocornut 1845ff4690 SDL example: tweaks ( )
ocornut 19e3c1506f Allegro5 example: added example from https://github.com/bggd/a5imgui_example
ocornut e49977a913 SDL example: hasty readme.
ocornut d041ebc6d4 Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives
ocornut b7e63c163c SDL example: update for indexed rendering.
ocornut b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
omar 12aba576fb Merge pull request from joeld42/antialias-ios-fix
AA branch: iOS Example: update for API changes and index rendering
ocornut a14f6696a3 SDL example: more cleanup to match other examples ( )
ocornut 22e099366f SDL example: further cleanup to match other examples ( )
ocornut 4167528001 SDL example: moved event loop to main.cpp , adding page up/page down. ()
Joel Davis 81cebb9c85 Simplified to not combine vert buffers like the opengl3 example
ocornut b7a2a6b23f SDL example: renamed folder, added in README
ocornut 44c23e0eed Allowing DeltaTime==0.0f to not assert
ocornut b3ae2976c5 SDL example: tweaks and fixes.
ocornut 046dbf502c Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf )
Joel Davis ca042134ae Update ios example for API changes and index rendering
ocornut 1cd391146d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives