ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont()

Merged AA branch in master! (#133)

ImFontAtlas: allow AddFontDefault to take a config

Comments (fixed old comments)

Include for alloca()

Examples: Simplified font examples comments.

ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242)

ImFont: comments, minor bits

ImFont: Cleanup to be compatible with over-sampling (not enabled)

Examples: displaying more font information.

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus (#272)

Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window (#272)

Metrics: more details in popup stack (#272)

ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype

Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)

Merge bits

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ...

Conflicts:
	imgui.cpp

Demo: custom rendering example uses AddRectFilledMultiColor()

ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.

Revert

Plot() function can take 0.0f for both scale_min/scale_max to calculate scale

Delete merging artefact that survived for a day

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ...

Conflicts:
	imgui.cpp

Changed SameLine() parameters from int to float.

Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()

InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag

InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.

Comments

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives