From 1e76c63bb67de10d397d75e802f391eccae8b9e0 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 1 Aug 2015 08:07:16 -0600 Subject: [PATCH 1/4] Fixed comment --- imgui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.h b/imgui.h index db5f48ded..9f3ea0cd2 100644 --- a/imgui.h +++ b/imgui.h @@ -1125,7 +1125,7 @@ struct ImFontConfig bool FontDataOwnedByAtlas; // true // TTF data ownership taken by the container ImFontAtlas (will delete memory itself). Set to true int FontNo; // 0 // Index of font within TTF file float SizePixels; // // Size in pixels for rasterizer - int OversampleH, OversampleV; // 2, 2 // Rasterize at higher quality for sub-pixel positioning. We don't use sub-pixel positions on the Y axis. + int OversampleH, OversampleV; // 3, 1 // Rasterize at higher quality for sub-pixel positioning. We don't use sub-pixel positions on the Y axis. bool PixelSnapH; // false // Align every character to pixel boundary (if enabled, set OversampleH/V to 1) ImVec2 GlyphExtraSpacing; // 0, 0 // Extra spacing (in pixels) between glyphs const ImWchar* GlyphRanges; // // List of Unicode range (2 value per range, values are inclusive, zero-terminated list) From f158617551ad5785e4db116a4bd9ca7e24b8f63a Mon Sep 17 00:00:00 2001 From: Jonathan Adamczewski Date: Sun, 2 Aug 2015 01:35:43 -0700 Subject: [PATCH 2/4] Show SDL error message on init failure --- examples/sdl_opengl_example/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/sdl_opengl_example/main.cpp b/examples/sdl_opengl_example/main.cpp index e2d236678..aac9c6a50 100644 --- a/examples/sdl_opengl_example/main.cpp +++ b/examples/sdl_opengl_example/main.cpp @@ -10,7 +10,10 @@ int main(int, char**) { // Setup SDL if (SDL_Init(SDL_INIT_EVERYTHING) != 0) + { + printf("Error: %s", SDL_GetError()); return -1; + } // Setup window SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); From 11d91a27a444ea810e1f1e6602a1e07b93ae8764 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 1 Aug 2015 17:18:01 -0600 Subject: [PATCH 3/4] Carriage return (#289) --- examples/sdl_opengl_example/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sdl_opengl_example/main.cpp b/examples/sdl_opengl_example/main.cpp index aac9c6a50..3499924c1 100644 --- a/examples/sdl_opengl_example/main.cpp +++ b/examples/sdl_opengl_example/main.cpp @@ -11,7 +11,7 @@ int main(int, char**) // Setup SDL if (SDL_Init(SDL_INIT_EVERYTHING) != 0) { - printf("Error: %s", SDL_GetError()); + printf("Error: %s\n", SDL_GetError()); return -1; } From 3ccbdc8423a9b79646b383eac68106fefcb32b63 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 1 Aug 2015 22:12:18 -0600 Subject: [PATCH 4/4] Unnecessary .gitignore in root folder --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 34a884e7c..000000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -imgui.ini