mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,499 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

1499 Commits

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