mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,910 Commits 9 Branches 125 Tags 187 MiB
Commit Graph

1910 Commits

Author SHA1 Message Date
ocornut 95138fa8d6 Merge branch 'master' of https://github.com/ocornut/imgui 2015-11-26 22:43:28 +00:00
ocornut 3102c0c97e Rename internal ColumnsStartX to IndentX, makes more sense 2015-11-26 22:43:21 +00:00
omar 60b75d78ea Update README.md 2015-11-24 19:13:05 +00:00
ocornut 10ba61f882 Added links 2015-11-24 15:35:07 +00:00
ocornut 5d84f4b450 Update README.md - faq 2015-11-22 23:16:19 +00:00
omar b959c74488 Update README.md - faq 2015-11-22 23:12:50 +00:00
ocornut 83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399) 2015-11-22 21:23:56 +00:00
ocornut dc86a8a0bf Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler (#411) 2015-11-22 17:16:55 +00:00
ocornut 38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line (#411) 2015-11-22 17:09:03 +01:00
omar 1e69a86d30 Update README.md 2015-11-20 09:36:43 +01:00
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374) 2015-11-19 23:09:59 +01:00
ocornut 6b03ddbcb1 Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment (#409) 2015-11-16 22:43:42 +01:00
ocornut e2ecc02e02 Examples: Updated README 2015-11-16 22:17:10 +01:00
ocornut f96de74e05 Merge branch 'zach2good-SDL_OpenGL3_Implementation' 2015-11-16 22:13:58 +01:00
ocornut 899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme (#356) 2015-11-16 22:13:06 +01:00
ocornut ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example (#356) 2015-11-16 22:12:18 +01:00
ocornut 9d0caa2e66 Examples: SDL+OpenGL3: Using glew like existing example + renaming (#356) 2015-11-16 22:05:22 +01:00
ocornut 624adb1b23 Tweak build batch files and readmes 2015-11-16 22:03:13 +01:00
ocornut 9a8cbf128d Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation 2015-11-16 21:35:49 +01:00
ocornut 693efccb62 ImageButton() uses FrameRounding up to a maximum of available framing size (#394) 2015-11-15 19:43:05 +01:00
ocornut 5549744e0f Minor popups comment tweak (#402) 2015-11-15 19:09:30 +01:00
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h (#405) 2015-11-13 17:08:54 +01:00
ocornut 9243aee62c Fixed unused variable warning if asserts are compiled out. 2015-11-11 10:26:12 +00:00
ocornut 3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files 2015-11-11 09:45:18 +00:00
omar 0b47edcefe Merge pull request #403 from JasonWilkins/master 
Fixed a couple of problems found by CppCat code analyzer.
 2015-11-10 23:28:51 +00:00
Jason Wilkins 4dee8473b5 Fixed a couple of problems found by CppCat code analyzer. 
* incorrect implementation of ImVec4 operator- which always gives a w value of 0
* boolean formula of ((A && B) || B) can be simplified to just (B)
 2015-11-10 17:06:37 -06:00
ocornut 1d76890526 Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples. 2015-11-08 22:52:25 +00:00
ocornut e4fb14a9e0 TODO notes 2015-11-08 11:00:56 +00:00
ocornut e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16 2015-11-08 11:00:31 +00:00
ocornut 4982cd136e Fixed Shutdown() not clearing FontAtlas if NewFrame() was never called. (#396, #303) 2015-11-07 23:10:09 +00:00
omar b168c72dd1 Update README.md 2015-11-01 22:53:29 +00:00
omar d963ff13ca Update README.md 2015-11-01 22:25:33 +01:00
omar acc87f7f5e Update README.md 2015-11-01 22:18:37 +01:00
ocornut 6b23fca1ff Speculative build fix for using alloca on PS4 & FreeBSD 2015-10-30 18:05:06 +01:00
ocornut 0a23e2c832 Tabs to spaces 2015-10-30 15:57:03 +01:00
ocornut 980ca286fe Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix #392) 2015-10-30 15:44:47 +01:00
ocornut 6ffe0fddbf Examples: Fixed crash when both buttons are held (#393) 2015-10-30 15:01:26 +01:00
ocornut 1a42a3f91b Refactor internal SliderBehavior() to take flags instead of a bool. 
Sorry!
 2015-10-30 11:43:23 +01:00
ocornut 3eabad0321 Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers. 
This is quite a risky change frankly but I'd rather refactor sooner than
later. Hopefully few people are using the internal functions.
 2015-10-30 11:36:51 +01:00
ocornut e858d229a0 Examples: update all examples with same comment (#389) 2015-10-30 10:45:16 +01:00
omar d0afb23a3f Merge pull request #389 from dougbinks/master 
Font merge demo and documentation minor additions.
 2015-10-30 10:39:59 +01:00
Doug Binks e1bc0dd7d5 Font merge demo and documentation minor additions. 
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
 2015-10-25 16:06:42 +00:00
omar 0b0c460324 Travis CI: revert, giving up update for now. 2015-10-19 20:10:43 +01:00
omar 7245599f04 Travis CI: test upgrading to container-based build (3) 2015-10-19 20:05:02 +01:00
omar d86dd37091 Travis CI: test upgrading to container-based build 2015-10-19 19:59:53 +01:00
omar f11adc1c08 Travis CI: test upgrading to container-based build 2015-10-19 19:57:46 +01:00
ocornut 217ef444d4 ColorEdit4: Fixed broken tooltip on hovering the color button (actually fixes #373, #380) 2015-10-19 12:02:52 +01:00
ocornut 5f0db60a57 Version number 1.47 WIP 2015-10-18 20:13:01 +01:00
omar 42529f1270 Merge pull request #378 from Gargaj/patch-1 
Examples: DirectX9: NULL out font texture on Invalidate so NewFrame() can be called directly without ImGui_ImplDX9_CreateDeviceObjects()
 2015-10-18 18:11:54 +01:00
Gargaj e4d916a4b3 NULL out font texture on invalidate 
If this isn't done, NewFrame won't re-create the font.
 2015-10-18 19:05:04 +02:00