Commit Graph

  • 18724f021a Merge branch 'JuJuBoSc-master' ocornut 2015-12-03 18:32:33 +00:00
  • 9596e6f794 Examples: DirectX10: Minor tweaks, updated to latest example changes (#424) ocornut 2015-12-03 18:32:01 +00:00
  • dadd03fc11 Examples: DirectX10: Fix warning, disable debug device, add ignore list (#424) ocornut 2015-12-03 18:20:48 +00:00
  • 59f0db6f15 Merge branch 'master' of https://github.com/JuJuBoSc/imgui into JuJuBoSc-master ocornut 2015-12-03 18:18:14 +00:00
  • 32c1a3e46c Removed d3d11 references Julian Bosch 2015-12-03 13:39:03 +01:00
  • 730e8119fe Updated stb_truetype 1.07 -> 1.08 ocornut 2015-12-03 12:35:27 +00:00
  • 1f3a0e78cc Ported d3d11 renderer to d3d10 Julian Bosch 2015-12-03 13:18:35 +01:00
  • fe2972e8b2 Merge pull request #420 from RaptorFactor/master omar 2015-11-30 19:36:06 +00:00
  • 6adf644448 Allow DX11 renderer to be used with devices with lower feature levels. Joshua Boyce 2015-12-01 05:08:30 +11:00
  • 1b7aee7b9d Examples: DX11: Remove debug flag (#415) ocornut 2015-11-30 10:22:46 +00:00
  • 632f9ec36a Commenting asserts ocornut 2015-11-30 09:45:45 +00:00
  • 5f8200d52c TreeNode/CollapsingHeader: some minor cleanup of that horrible function. ocornut 2015-11-29 22:38:58 +00:00
  • d1b4159b51 TreeNode/CollapsingHeader: some minor cleanup of that horrible function. ocornut 2015-11-29 22:25:13 +00:00
  • 9dca2ca960 Comments & spacing ocornut 2015-11-29 22:01:26 +00:00
  • b7e1ae4bf9 Added comment on using PushFont() before building the font (#232) ocornut 2015-11-29 21:33:51 +00:00
  • a500c0daf7 Demo: some TreeNode layout examples (#414, #282) ocornut 2015-11-29 21:02:15 +00:00
  • 4006fb77bc TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (#414, #282) ocornut 2015-11-29 20:35:58 +00:00
  • 546962351b Internal minor renaming ocornut 2015-11-29 20:27:48 +00:00
  • 6cee2fca94 Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples. ocornut 2015-11-29 14:54:05 +00:00
  • 6269859315 Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing. ocornut 2015-11-29 14:15:07 +00:00
  • 3aebddc4ac Tweak GetGlyphRangesJapanese() to it is easier to modify ocornut 2015-11-29 11:55:54 +00:00
  • 94ec3d534e Examples: Header comments. ocornut 2015-11-29 11:25:15 +00:00
  • 6800939e73 Examples: Header comments. ocornut 2015-11-29 11:19:30 +00:00
  • 5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments. ocornut 2015-11-29 11:11:03 +00:00
  • d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it. ocornut 2015-11-29 11:01:50 +00:00
  • 9735563b65 Additional comments for new users ocornut 2015-11-29 10:53:03 +00:00
  • eb6575508f Demo: Tweaked Clipping example. ocornut 2015-11-29 10:29:06 +00:00
  • b2b4bbe5ea Demo: Fixed variable shadowing warning. ocornut 2015-11-29 10:25:55 +00:00
  • 79b09e7d10 Fixed int>void* warnings for 64-bits architectures and fancy warnings ocornut 2015-11-29 10:20:50 +00:00
  • f505a372fd Speculative build fix for old versions of Visual Studio compiler ocornut 2015-11-28 20:00:40 +00:00
  • ba77166432 Demo: comments (#414) ocornut 2015-11-28 17:23:32 +00:00
  • 32d2768734 Demo: Moved property editor demo to its own mini example applet (#414) ocornut 2015-11-28 17:16:59 +00:00
  • d3df39fed1 Columns: Added Property Tree demo among tidying up demos (#125, #414) ocornut 2015-11-28 16:44:09 +00:00
  • 4ca34a879d Columns: Fixed bug with indentation within columns, also making code shorter/faster (#414, #125) ocornut 2015-11-28 16:36:25 +00:00
  • a9009b133c Columns: Undo accidental change from 807d4ff92c ocornut 2015-11-28 15:52:57 +00:00
  • 6e2e60ffad Merge branch 'master' of https://github.com/ocornut/imgui ocornut 2015-11-28 15:35:22 +00:00
  • e4ba6e525b Columns:: columns set with no implicit id include the columns count into the id to avoid collisions (#125) ocornut 2015-11-28 15:35:10 +00:00
  • 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns (#414) ocornut 2015-11-28 12:14:50 +00:00
  • c0ec9f4e63 Merge pull request #416 from zryan3/bugfix/sdl2_typos omar 2015-11-28 09:36:06 +00:00
  • aa6cb32bd4 fixed text referencing GLFW library in SDL examples zryan3 2015-11-27 23:04:35 -07:00
  • b4556c404d Update README.md omar 2015-11-27 23:43:19 +00:00
  • bfacd250df Update README.md omar 2015-11-27 23:42:07 +00:00
  • 58b23b4785 Columns: avoid growing ColumnsData vector when closing a window with no columns (#125) ocornut 2015-11-26 23:07:10 +00:00
  • 1aac69c937 Columns: tidying up, moving OffsetT to a ImGuiColumnData structure ocornut 2015-11-26 23:01:15 +00:00
  • 95138fa8d6 Merge branch 'master' of https://github.com/ocornut/imgui ocornut 2015-11-26 22:43:28 +00:00
  • 3102c0c97e Rename internal ColumnsStartX to IndentX, makes more sense ocornut 2015-11-26 22:43:21 +00:00
  • 60b75d78ea Update README.md omar 2015-11-24 19:13:05 +00:00
  • 10ba61f882 Added links ocornut 2015-11-24 15:35:07 +00:00
  • 5d84f4b450 Update README.md - faq ocornut 2015-11-22 23:16:19 +00:00
  • b959c74488 Update README.md - faq omar 2015-11-22 23:12:50 +00:00
  • 83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399) ocornut 2015-11-22 21:23:56 +00:00
  • dc86a8a0bf Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler (#411) ocornut 2015-11-22 17:16:55 +00:00
  • 38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line (#411) ocornut 2015-11-22 17:08:56 +01:00
  • 1e69a86d30 Update README.md omar 2015-11-20 09:36:43 +01:00
  • 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374) ocornut 2015-11-19 23:09:59 +01:00
  • 6b03ddbcb1 Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment (#409) ocornut 2015-11-16 22:43:42 +01:00
  • e2ecc02e02 Examples: Updated README ocornut 2015-11-16 22:17:10 +01:00
  • f96de74e05 Merge branch 'zach2good-SDL_OpenGL3_Implementation' ocornut 2015-11-16 22:13:58 +01:00
  • 899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme (#356) ocornut 2015-11-16 22:13:06 +01:00
  • ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example (#356) ocornut 2015-11-16 22:12:18 +01:00
  • 9d0caa2e66 Examples: SDL+OpenGL3: Using glew like existing example + renaming (#356) ocornut 2015-11-16 22:05:22 +01:00
  • 624adb1b23 Tweak build batch files and readmes ocornut 2015-11-16 22:03:13 +01:00
  • 9a8cbf128d Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation ocornut 2015-11-16 21:35:49 +01:00
  • 693efccb62 ImageButton() uses FrameRounding up to a maximum of available framing size (#394) ocornut 2015-11-15 19:43:05 +01:00
  • 5549744e0f Minor popups comment tweak (#402) ocornut 2015-11-15 19:09:30 +01:00
  • f87deff0f3 Moving stdlib.h include outside of imgui.h (#405) ocornut 2015-11-13 17:08:54 +01:00
  • 9243aee62c Fixed unused variable warning if asserts are compiled out. ocornut 2015-11-11 10:26:12 +00:00
  • 3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files ocornut 2015-11-11 09:45:18 +00:00
  • 0b47edcefe Merge pull request #403 from JasonWilkins/master omar 2015-11-10 23:28:51 +00:00
  • 4dee8473b5 Fixed a couple of problems found by CppCat code analyzer. Jason Wilkins 2015-11-10 17:06:37 -06:00
  • 1d76890526 Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples. ocornut 2015-11-08 22:52:25 +00:00
  • e4fb14a9e0 TODO notes ocornut 2015-11-08 11:00:56 +00:00
  • e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16 ocornut 2015-11-08 11:00:31 +00:00
  • 4982cd136e Fixed Shutdown() not clearing FontAtlas if NewFrame() was never called. (#396, #303) ocornut 2015-11-07 23:10:01 +00:00
  • b168c72dd1 Update README.md omar 2015-11-01 22:53:29 +00:00
  • d963ff13ca Update README.md omar 2015-11-01 22:25:33 +01:00
  • acc87f7f5e Update README.md omar 2015-11-01 22:18:37 +01:00
  • 6b23fca1ff Speculative build fix for using alloca on PS4 & FreeBSD ocornut 2015-10-30 18:05:06 +01:00
  • 0a23e2c832 Tabs to spaces ocornut 2015-10-30 15:57:03 +01:00
  • 980ca286fe Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix #392) ocornut 2015-10-30 15:44:47 +01:00
  • 6ffe0fddbf Examples: Fixed crash when both buttons are held (#393) ocornut 2015-10-30 15:01:26 +01:00
  • 1a42a3f91b Refactor internal SliderBehavior() to take flags instead of a bool. ocornut 2015-10-30 11:43:23 +01:00
  • 3eabad0321 Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers. ocornut 2015-10-30 11:36:51 +01:00
  • e858d229a0 Examples: update all examples with same comment (#389) ocornut 2015-10-30 10:45:16 +01:00
  • d0afb23a3f Merge pull request #389 from dougbinks/master omar 2015-10-30 10:39:59 +01:00
  • e1bc0dd7d5 Font merge demo and documentation minor additions. Clarifies the lifetime requirements for the ranges parameter for AddFont* functions. Doug Binks 2015-10-25 16:06:42 +00:00
  • 0b0c460324 Travis CI: revert, giving up update for now. omar 2015-10-19 20:10:43 +01:00
  • 7245599f04 Travis CI: test upgrading to container-based build (3) omar 2015-10-19 20:05:02 +01:00
  • d86dd37091 Travis CI: test upgrading to container-based build omar 2015-10-19 19:59:53 +01:00
  • f11adc1c08 Travis CI: test upgrading to container-based build omar 2015-10-19 19:57:46 +01:00
  • 217ef444d4 ColorEdit4: Fixed broken tooltip on hovering the color button (actually fixes #373, #380) ocornut 2015-10-19 12:02:52 +01:00
  • 5f0db60a57 Version number 1.47 WIP ocornut 2015-10-18 20:13:01 +01:00
  • 42529f1270 Merge pull request #378 from Gargaj/patch-1 omar 2015-10-18 18:11:54 +01:00
  • e4d916a4b3 NULL out font texture on invalidate Gargaj 2015-10-18 19:05:04 +02:00
  • 72dde4d323 Version 1.46 v1.46 ocornut 2015-10-18 17:36:27 +01:00
  • fbdcb51dde Fix to allow using SetNextWindow* functions with ImGuiSetCond_Appearing on modal windows (#377) ocornut 2015-10-18 17:30:53 +01:00
  • 8b9c0b2545 Tweaks (calling inner SetNext* functions directly from Begin) ocornut 2015-10-18 17:20:03 +01:00
  • 7a61b7dd57 Renamed Window LastFrameDrawn to LastFrameActive, more correct ocornut 2015-10-18 16:57:10 +01:00
  • 465e6839a4 ColorEdit4: hovering the color button shows correct alpha (fix #373) ocornut 2015-10-18 16:24:44 +01:00
  • 5b7a2149fc ColorConvertFloat4ToU32() round the floats instead of truncating them. ocornut 2015-10-18 16:09:37 +01:00