Commit Graph

70 Commits (2081fc15b51f5218f3e20845a1b9b49707b93a76)

Author SHA1 Message Date
omar 47e81a6194 Merge branch 'master' into navigation
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ()
omar 23c11e9764 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar cca9c3e3da Examples: Using Dark theme by default. (). Tweaked demo code.
omar 2933e6765c Merge branch 'master' into navigation
omar 6a25a8720a Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
omar 827f4b17d3 Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). ()
omar 3967ff58b2 Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). ()
omar 39cb56c39e Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 ()
omar ce13426a1a Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
omar 1b86e7343f Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
omar fba704bf5d Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (, , , , , , , , , , , , , , and more)
omar 36f00811b9 Examples: Comments to guide people unfamiliar with the librairies used.
omar cb38caeda4 Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. , , , , , , , etc.)
omar b3099d650c Examples: Adding Roboto to the commented-out font list, and removing the unnecessary ProggyClean from there.
omar 842e88a8e3 Examples: Avoid using ImColor() to not tempt newcomers into looking at it
omar b8ade0b94f Examples: Main: Removed call to SetNextWindowSize()
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
omar 645875a240 Examples: Enable vsync by default in example applications (, )
ocornut a68ac96bc4 Examples: GL3: Comments about gl3w ()
ocornut 94ec3d534e Examples: Header comments.
ocornut 5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments.
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h ()
ocornut e858d229a0 Examples: update all examples with same comment ()
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ()
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf
ocornut 0224d29a35 Examples: comments.
ocornut fcec337061 Examples: Simplified font examples comments.
Gordon McShane 6ee65fc5af Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
ocornut d25578efd8 Examples: initializing float + missing comment.
ocornut 3abfb85613 Comments on font loading, fixed commented out paths and added DroidSans in the list
ocornut cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
ocornut 7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
ocornut 5879f3f5ac Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
ocornut 2dd92e3eed Examples: Clang/Linux warning fixes.
ocornut b87ec205a9 Examples: shallow tweaks to match upcoming other examples.
ocornut d829852391 Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
ocornut be9fe9489c Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
ocornut e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
User need to set io.ImeWindowHandle
ocornut 3ed38f3313 Replaced dependency on glew (inc. prebuilt one for Windows) by gl3w in source form
Expecting something to break now.
ocornut 40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
ocornut cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature
..and to reduce sample code size a little.
ocornut d65e051a07 Minor formatting tweaks, comments
ocornut 381c7428c1 Examples: changed default background color.
ocornut edcf2d3bf6 Examples: more comments on loading fonts.
ocornut 1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments.
ocornut 2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
ocornut cb9a3235be Removed PixelCenterOffset, uncesssary
ocornut ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
	imgui.cpp
	imgui.h
ocornut 62ecdd21a5 Examples: Added a color slider for the background color + tweak first example use of button.s