1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-27 10:06:35 +00:00
Commit Graph

63 Commits

Author SHA1 Message Date
omar
b85f345369 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
2018-09-14 11:32:55 +02:00
omar
1afd29d382 Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo. 2018-09-13 16:50:13 +02:00
omar
fd201a90f1 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
2018-08-31 18:39:02 +02:00
omar
5d40d295b3 Comments, readme updates 2018-08-31 11:37:14 +02:00
omar
e5f2295398 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
2018-08-13 17:50:48 -07:00
omar
d5793102db imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (, ) 2018-08-09 17:42:53 +02:00
omar
6277781e83 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
2018-07-08 13:08:16 +02:00
omar
89e2ddf07f Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx 2018-07-08 11:16:11 +02:00
omar
569e0f07f1 Examples: Removed old example_apple/ + tweak comments () 2018-07-08 10:57:16 +02:00
Omar Cornut
c3f9220c15 Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments 2018-07-08 10:47:31 +02:00
omar
0d7e779b37 Merge branch 'master' into osx
# Conflicts:
#	examples/.gitignore
#	examples/README.txt
2018-07-04 13:13:11 +02:00
omar
ce500f8727 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
2018-06-22 12:01:42 +02:00
omar
2ce121b7d0 Readme, Links, Bindings 2018-06-16 10:43:05 +02:00
omar
40845852b9 Fixed warnings + readme 2018-06-16 10:23:11 +02:00
omar
24aeca3d0c Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
2018-06-12 16:24:24 +02:00
omar
cdf51cad2d Comments, documentation 2018-06-11 19:52:40 +02:00
omar
a1b6766d43 Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. () 2018-06-11 19:27:57 +02:00
omar
fac0c801da Examples: Added imgui_impl_osx.mm bindings (, ) 2018-06-11 10:19:17 +02:00
omar
6f7b7807ad Fixed Travis path + various paths in comments/documentations 2018-06-10 16:14:43 +02:00
omar
9660657e95 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_sdl.cpp
2018-06-10 15:59:35 +02:00
omar
5a13e4dcde Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp () + changelog bits 2018-06-10 15:58:21 +02:00
omar
8d58fbb5ed Examples: Renamed example folders. () 2018-06-10 15:42:14 +02:00
omar
85f9694bd4 Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ()
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
2018-06-08 19:37:33 +02:00
omar
24fc7c30dd Examples: Documentation 2018-06-08 00:00:12 +02:00
omar
63be3e7c82
Update README.txt 2018-02-22 23:20:37 +01:00
omar
9be7d048c8 Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. () 2018-02-22 23:03:47 +01:00
omar
0d063585e8 Merge branch 'jdm3_master' 2018-02-22 17:04:15 +01:00
omar
277f6e7842 Examples: Comments 2018-01-24 18:40:23 +01:00
omar
ef5dd30625 Sisyphus says: tweaked comments about not using old-style OpenGL examples (, etc.) 2017-11-24 09:27:45 +01:00
omar
6bd3b45b34 Sisyphus says: tweaked comments about not using old-style OpenGL examples (, etc.) 2017-11-24 09:23:17 +01:00
omar
c5027d4fa1 Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. () 2017-10-25 20:55:15 +02:00
Jefferson Montgomery
f72b95d73f Merge 'ocornut/master' into 'jdmo3/master' 2017-09-24 14:43:11 -07:00
ocornut
d5d825debb Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ()
Missing support Vulkan (), Apple (, ), SDL (, ),
Allegro, Marmalade (, )
2017-09-18 16:04:44 +02:00
omar
f030087f8e Comments to redirect people to OpenGL3 examples () 2017-04-26 18:27:10 +02:00
Jefferson Montgomery
30954b4a88 Merge latest from ocornut/imgui 2017-03-13 13:26:55 -07:00
ocornut
612b17ef57 Fixing minor english typos () 2016-09-11 22:02:35 +02:00
ocornut
3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:18:09 +02:00
Jeongseok Lee
47911d92b2 Fix minor typo in examples/README.txt 2016-05-20 07:04:54 -04:00
ocornut
71b981d05f Examples: Apple: Readme tweaks ( ) 2016-04-05 22:50:23 +02:00
ocornut
0e7b9b8284 Examples: Vulkan: Coding style tweaks. 2016-04-03 17:32:53 +02:00
ocornut
ae0c33c983 Examples: Links 2016-03-29 11:33:23 +02:00
Jefferson Montgomery
f6181b3428 Examples: DirectX12: Add directx12_example 2016-02-22 15:22:48 -08:00
ocornut
a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments. 2016-01-21 21:40:22 +00:00
ocornut
9e8795f4e2 Examples: Added extra comments 2016-01-21 18:51:42 +00:00
ocornut
9596e6f794 Examples: DirectX10: Minor tweaks, updated to latest example changes () 2015-12-03 18:32:01 +00:00
ocornut
d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it. 2015-11-29 11:01:50 +00:00
ocornut
9735563b65 Additional comments for new users 2015-11-29 10:53:03 +00:00
ocornut
e2ecc02e02 Examples: Updated README 2015-11-16 22:17:10 +01:00
gzito
50b25b6c75 Added example for the Marmalade platform 2015-10-08 22:38:37 +02:00
ocornut
25b4b88a7a Examples: Update readme. 2015-09-10 21:10:01 +01:00