ocornut
|
fd44b9440b
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
9 years ago |
|
ocornut
|
b67593a4b1
|
Changed SameLine() parameters from int to float.
|
9 years ago |
|
ocornut
|
8094aa78d2
|
Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
|
9 years ago |
|
ocornut
|
827ff970cd
|
InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
|
9 years ago |
|
ocornut
|
d2701727b9
|
InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
|
9 years ago |
|
ocornut
|
f2bed00d80
|
Examples: README
|
9 years ago |
|
ocornut
|
5ab23ab1c0
|
Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
|
9 years ago |
|
ocornut
|
398ef1a212
|
Comments
|
9 years ago |
|
ocornut
|
245cf36522
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
9 years ago |
|
ocornut
|
890585cde8
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
9 years ago |
|
ocornut
|
08b1dd1035
|
Version number 1.43 WIP
Bits
|
9 years ago |
|
ocornut
|
fec09e37ab
|
Disable warnings, undo f4aae6b9ec (#265 #266)
|
9 years ago |
omar
|
7d45c84f21
|
Merge pull request #266 from Extrawurst/patch-4
Fix minor clang-x64 warnings (fixes #265)
|
9 years ago |
Stephan Dilly
|
f4aae6b9ec
|
fix minor clang-x64 warnings
fixes #265
|
9 years ago |
|
ocornut
|
09e8c4ec11
|
AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133)
|
9 years ago |
|
omar
|
d81ba432ec
|
New demo binaries
|
9 years ago |
|
ocornut
|
e5bea65582
|
Version number 1.42
|
9 years ago |
|
ocornut
|
2f574ef952
|
Allegro 5 example: converted for indexed rendering.
|
9 years ago |
|
ocornut
|
60dd221737
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
9 years ago |
|
ocornut
|
bbaaab7537
|
Allegro 5 example: fixed uv coordinate of non-default texture.
|
9 years ago |
|
ocornut
|
4d2d0ce5cd
|
Allegro 5 example: handling of hardware and software mouse cursor rendering.
|
9 years ago |
|
ocornut
|
8db229b96f
|
Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
|
9 years ago |
|
ocornut
|
c58d61dfd1
|
Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
|
9 years ago |
|
ocornut
|
489e28ec11
|
Allegro 5 example: main.cpp matches other examples. added window title.
|
9 years ago |
|
ocornut
|
1845ff4690
|
SDL example: tweaks (#233 #226)
|
9 years ago |
|
ocornut
|
19e3c1506f
|
Allegro5 example: added example from https://github.com/bggd/a5imgui_example
|
9 years ago |
|
ocornut
|
e49977a913
|
SDL example: hasty readme.
|
9 years ago |
|
ocornut
|
d041ebc6d4
|
Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives
|
9 years ago |
|
ocornut
|
b7e63c163c
|
SDL example: update for indexed rendering.
|
9 years ago |
|
ocornut
|
b36ff2fec3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
9 years ago |
|
omar
|
12aba576fb
|
Merge pull request #264 from joeld42/antialias-ios-fix
AA branch: iOS Example: update for API changes and index rendering
|
9 years ago |
|
ocornut
|
a14f6696a3
|
SDL example: more cleanup to match other examples (#233 #226)
|
9 years ago |
|
ocornut
|
22e099366f
|
SDL example: further cleanup to match other examples (#233 #226)
|
9 years ago |
|
ocornut
|
4167528001
|
SDL example: moved event loop to main.cpp , adding page up/page down. (#226)
|
9 years ago |
Joel Davis
|
81cebb9c85
|
Simplified to not combine vert buffers like the opengl3 example
|
9 years ago |
|
ocornut
|
b7a2a6b23f
|
SDL example: renamed folder, added in README
|
9 years ago |
|
ocornut
|
44c23e0eed
|
Allowing DeltaTime==0.0f to not assert
|
9 years ago |
|
ocornut
|
b3ae2976c5
|
SDL example: tweaks and fixes.
|
9 years ago |
|
ocornut
|
046dbf502c
|
Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2
|
9 years ago |
|
ocornut
|
e3b9a61883
|
Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264)
|
9 years ago |
|
Joel Davis
|
ca042134ae
|
Update ios example for API changes and index rendering
|
9 years ago |
|
ocornut
|
1cd391146d
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
9 years ago |
|
ocornut
|
67d93156df
|
Fixed clang/gcc warnings (#133)
|
9 years ago |
|
ocornut
|
5f039e7098
|
Merge branch 'ios_example_merge'
|
9 years ago |
|
ocornut
|
7d144eb899
|
iOS Example: Optimise PNG files size
|
9 years ago |
|
ocornut
|
fb27360ea8
|
iOS example: shallow tweaks and fixes (untested)
|
9 years ago |
|
Joel Davis
|
eee6dab226
|
iOS example working based on modified OpenGL3 example + Synergy
|
9 years ago |
|
ocornut
|
54c2665032
|
AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path (#133)
|
9 years ago |
|
ocornut
|
439040bb25
|
AA branch: more comments on breaking changes (#133)
|
9 years ago |
|
ocornut
|
d03b046ef4
|
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133)
|
9 years ago |