ocornut
|
1cd391146d
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
10 years ago |
|
ocornut
|
7d144eb899
|
iOS Example: Optimise PNG files size
|
10 years ago |
|
ocornut
|
fb27360ea8
|
iOS example: shallow tweaks and fixes (untested)
|
10 years ago |
Joel Davis
|
eee6dab226
|
iOS example working based on modified OpenGL3 example + Synergy
|
10 years ago |
|
ocornut
|
d03b046ef4
|
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133)
|
10 years ago |
|
ocornut
|
25882c47a3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
|
10 years ago |
|
ocornut
|
502e360ee5
|
Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
|
10 years ago |
|
ocornut
|
6a22835f63
|
AA branch: ImDrawList: rename commands to cmd_buffer
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
|
10 years ago |
|
ocornut
|
b2b616be00
|
AA branch: ImDrawCmd idx_count -> elem_count
|
10 years ago |
|
ocornut
|
f3303fa84f
|
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254)
|
10 years ago |
|
ocornut
|
8b4a470e1d
|
Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
|
10 years ago |
|
ocornut
|
61e551e0ee
|
AA branch: fixed warning
|
10 years ago |
|
ocornut
|
f435e42561
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
|
10 years ago |
|
ocornut
|
7437b43b2d
|
Fixed warnings for more pedantic settings (#258)
|
10 years ago |
|
ocornut
|
b69d7d9df3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
10 years ago |
|
ocornut
|
2f03511062
|
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
|
10 years ago |
|
ocornut
|
71e9f2a3dd
|
Fixed warnings for 64-bits builds
|
10 years ago |
|
ocornut
|
e3f2ad728a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
|
10 years ago |
Gordon McShane
|
6ee65fc5af
|
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
|
10 years ago |
|
ocornut
|
b6f3c97e3b
|
Examples: DirectX11: explicitly set rasterizer state.
|
10 years ago |
|
ocornut
|
e9b6e437eb
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
imgui.h
|
10 years ago |
|
ocornut
|
5df542c3c0
|
ImFontAtlas: doesn't clear input data, left to the application. (#224)
|
10 years ago |
|
ocornut
|
f00662a5ad
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
10 years ago |
|
ocornut
|
ad7f600e0d
|
Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155)
|
10 years ago |
|
ocornut
|
18a00c7060
|
Examples: DirectX9/11: Fixed key mapping for down arrow.
|
10 years ago |
|
ocornut
|
4f1acf0d4a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
|
10 years ago |
|
ocornut
|
f400ea4ec8
|
Examples: OpenGL3: backup/restore current program and texture #195
|
10 years ago |
Dale Kim
|
ac518a1d3e
|
Set modifier key state by inspecting imgui's io.KeysDown array.
|
10 years ago |
|
ocornut
|
43cb4038c6
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
|
10 years ago |
|
ocornut
|
71429d306e
|
Examples: Simplified GLFW keyboard callbacks
|
10 years ago |
|
ocornut
|
c735d3066b
|
Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
|
10 years ago |
|
Dale Kim
|
fe15756129
|
Simplified glfw keyboard callbacks.
|
10 years ago |
|
ocornut
|
d809abbe1c
|
Examples: DirectX11: tidying up.
|
10 years ago |
|
ocornut
|
7ab49f80ca
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
|
10 years ago |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
10 years ago |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
10 years ago |
|
ocornut
|
37f1715bfa
|
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
|
10 years ago |
|
ocornut
|
1746b04065
|
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
|
10 years ago |
|
ocornut
|
d9ff617ff8
|
Examples: Formatting #187
|
10 years ago |
heroboy
|
e09e2cbd28
|
set pixel shader and vertex shader to NULL
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
|
10 years ago |
omar
|
46769406dc
|
Update README.txt
|
10 years ago |
|
ocornut
|
73e2d56acc
|
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
|
10 years ago |
|
Dale Kim
|
4b7be31197
|
Fixed modifier key state setting in GLFW callbacks.
|
10 years ago |
|
ocornut
|
d25578efd8
|
Examples: initializing float + missing comment.
|
10 years ago |
|
ocornut
|
3abfb85613
|
Comments on font loading, fixed commented out paths and added DroidSans in the list
|
10 years ago |
|
ocornut
|
ed94edfd8e
|
Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
|
10 years ago |
Adam D. Moss
|
c1766c95ed
|
OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
|
10 years ago |
biller23
|
2f4271a2b3
|
typo ImGui_ImplGlfwGL3_KeyCallback()
|
10 years ago |
|
ocornut
|
cb285c4d35
|
Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
|
10 years ago |
|
ocornut
|
04358c301e
|
Removed extraneous spaces
|
10 years ago |