ocornut
|
95f489ac1f
|
Merged AA branch in master! (#133)
|
2015-07-15 08:00:12 -06:00 |
|
ocornut
|
3e3d9f9a69
|
ImFontAtlas: allow AddFontDefault to take a config
|
2015-07-15 07:58:33 -06:00 |
|
ocornut
|
7ad4843f57
|
Fixed comments
|
2015-07-15 07:52:20 -06:00 |
|
ocornut
|
99a92ee7c5
|
Comments (fixed old comments)
|
2015-07-15 07:46:31 -06:00 |
|
ocornut
|
8952b93b2f
|
Include for alloca()
|
2015-07-15 07:31:32 -06:00 |
|
ocornut
|
fcec337061
|
Examples: Simplified font examples comments.
|
2015-07-15 07:05:34 -06:00 |
|
ocornut
|
815168c7ef
|
ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242)
|
2015-07-15 07:01:21 -06:00 |
|
ocornut
|
6ae8062ca0
|
ImFont: comments, minor bits
|
2015-07-14 15:51:19 -06:00 |
|
ocornut
|
c02f9b58ef
|
ImFont: Cleanup to be compatible with over-sampling (not enabled)
|
2015-07-14 12:41:02 -06:00 |
|
ocornut
|
fc6545830b
|
Examples: displaying more font information.
|
2015-07-14 10:28:55 -06:00 |
|
ocornut
|
faec745438
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
2015-07-14 09:23:50 -06:00 |
|
ocornut
|
8cfd963fda
|
Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus (#272)
|
2015-07-14 09:21:41 -06:00 |
|
ocornut
|
355cbf6326
|
Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window (#272)
|
2015-07-14 09:10:31 -06:00 |
|
ocornut
|
52c820e7b0
|
Metrics: more details in popup stack (#272)
|
2015-07-14 09:09:52 -06:00 |
|
ocornut
|
ba9317b924
|
ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
|
2015-07-13 16:08:49 -06:00 |
|
ocornut
|
5b053dd350
|
Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
|
2015-07-13 15:52:57 -06:00 |
|
ocornut
|
7eca4e2a7f
|
Merge bits
|
2015-07-12 11:05:30 -06:00 |
|
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 |
|