ocornut
|
042a3b01d2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2020-10-14 14:44:03 +02:00 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
2020-10-14 14:42:00 +02:00 |
|
ocornut
|
a7e21fb05f
|
Moving backends code from examples/ to backends/ (step 3: fixing project files)
|
2020-10-14 14:41:40 +02:00 |
|
ocornut
|
124c2608f1
|
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
|
2020-10-12 17:54:52 +02:00 |
|
ocornut
|
05bc204dbd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
|
2020-08-18 17:51:43 +02:00 |
|
omar
|
14539b3ed2
|
Update Emscripten readme about emrun (#3412)
|
2020-08-18 12:34:19 +02:00 |
|
omar
|
d3fcc37e9e
|
Update Emscripten readme about local XHR requests (#3412)
|
2020-08-18 12:27:40 +02:00 |
|
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
omar
|
5be649e082
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2020-02-02 21:21:54 +01:00 |
|
omar
|
05a49f0413
|
Examples: Emscripten: Demonstrating embedding fonts in Makefile and code. (#2953) [@Oipo]
|
2020-01-30 17:15:15 +01:00 |
|
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
2019-11-25 18:29:28 +01:00 |
|
omar
|
4e90906b04
|
Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734)
Using in Emscripten example.
|
2019-11-19 21:14:44 +01:00 |
|
omar
|
69b5c2f541
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-11-08 15:45:12 +01:00 |
|
omar
|
3929255b77
|
Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. (#2877, #2878) [@podsvirov]
|
2019-11-05 12:53:30 +01:00 |
|
Konstantin Podsvirov
|
916487a653
|
example_emscripten: skip outdated compiler option
For more info see: https://github.com/ocornut/imgui/issues/2877
|
2019-11-05 12:43:15 +01:00 |
|
omar
|
0cbb96895a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
|
2019-10-24 15:11:37 +02:00 |
|
Funto
|
75d540d336
|
Example: Emscripten: Fix for compilation (filesystem module is required) (#2734)
|
2019-10-23 16:55:26 +02:00 |
|
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
2019-06-06 16:13:30 +02:00 |
|
omar
|
a649d904d7
|
Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494)
|
2019-04-26 00:28:28 +02:00 |
|
omar
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
2019-04-23 12:38:59 +02:00 |
|
Andre Weissflog
|
74a3878be4
|
emscripten: replace shell_minimal.html with 'soft fullscreen' version
|
2019-04-17 11:59:26 +02:00 |
|
omar
|
1fe6533192
|
Examples: Emscripten: Tweaks for size. (#2494)
|
2019-04-15 17:18:31 +02:00 |
|
omar
|
eeea7da3d0
|
Examples: Emscripten: Fixed error in shell template. (#2494)
|
2019-04-15 01:46:34 +02:00 |
|
omar
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
2019-04-15 01:28:44 +02:00 |
|
Nicolas "Pixel" Noble
|
a936d0669c
|
Adding standalone Emscripten example.
|
2019-04-13 22:39:42 +02:00 |
|