Cleanup #12
Merged
Cleanup #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is an integration commit for the virtual branches that GitButler is tracking. Due to GitButler managing multiple virtual branches, you cannot switch back and forth between git branches and virtual branches easily. If you switch to another branch, GitButler will need to be reinitialized. If you commit on this branch, GitButler will throw it away. Here are the branches that are currently applied: - imgui-docking (refs/gitbutler/imgui-docking) branch head: 676c216 - TrafficTactician/imgui.ini - TrafficTactician/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx12.cpp - TrafficTactician/lib/imgui-docking/imgui_tables.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/example_sdl3_opengl3.vcxproj - TrafficTactician/lib/imgui-docking/backends/imgui_impl_android.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_allegro5.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/Makefile - TrafficTactician/lib/imgui-docking/examples/example_allegro5/example_allegro5.vcxproj - TrafficTactician/lib/imgui-docking/backends/vulkan/glsl_shader.frag - TrafficTactician/lib/imgui-docking/docs/TODO.txt - TrafficTactician/lib/imgui-docking/misc/fonts/DroidSans.ttf - TrafficTactician/lib/imgui-docking/.github/workflows/static-analysis.yml - TrafficTactician/lib/imgui-docking/backends/imgui_impl_glfw.h - TrafficTactician/lib/imgui-docking/misc/fonts/Cousine-Regular.ttf - TrafficTactician/lib/imgui-docking/misc/cpp/README.txt - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/Makefile.emscripten - TrafficTactician/lib/imgui-docking/LICENSE.txt - TrafficTactician/lib/imgui-docking/imstb_rectpack.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_metal.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_win32_directx9/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_allegro5/example_allegro5.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/vulkan/generate_spv.sh - TrafficTactician/lib/imgui-docking/examples/example_glfw_wgpu/README.md - TrafficTactician/lib/imgui-docking/examples/example_glfw_wgpu/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_glfw_wgpu/CMakeLists.txt - TrafficTactician/lib/imgui-docking/examples/example_apple_opengl2/main.mm - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/build.gradle - TrafficTactician/lib/imgui-docking/backends/imgui_impl_win32.cpp - TrafficTactician/lib/imgui-docking/.github/workflows/build.yml - TrafficTactician/lib/imgui-docking/.github/ISSUE_TEMPLATE/config.yml - TrafficTactician/lib/imgui-docking/examples/libs/emscripten/emscripten_mainloop_stub.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/example_sdl2_opengl3.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_win32.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_vulkan.cpp - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl2/main.cpp - TrafficTactician/lib/imgui-docking/misc/fonts/Karla-Regular.ttf - TrafficTactician/lib/imgui-docking/misc/single_file/imgui_single_file.h - TrafficTactician/lib/imgui-docking/misc/fonts/ProggyClean.ttf - TrafficTactician/lib/imgui-docking/examples/example_win32_directx11/example_win32_directx11.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/main.mm - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/main.cpp - TrafficTactician/lib/imgui-docking/examples/libs/glfw/include/GLFW/glfw3.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_directx11/example_sdl2_directx11.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_glut.cpp - TrafficTactician/lib/imgui-docking/docs/BACKENDS.md - TrafficTactician/rock.jpg - TrafficTactician/lib/imgui-docking/misc/README.txt - TrafficTactician/lib/imgui-docking/misc/freetype/README.md - TrafficTactician/lib/imgui-docking/misc/freetype/imgui_freetype.h - TrafficTactician/lib/imgui-docking/misc/debuggers/imgui.natvis - TrafficTactician/lib/imgui-docking/docs/FAQ.md - TrafficTactician/lib/imgui-docking/backends/imgui_impl_wgpu.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_vulkan/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_win32_directx9/build_win32.bat - TrafficTactician/lib/imgui-docking/imgui_internal.h - TrafficTactician/lib/imgui-docking/examples/example_win32_directx12/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_glfw_wgpu/Makefile.emscripten - TrafficTactician/lib/imgui-docking/examples/example_win32_directx10/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/build_win32.bat - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx9.h - TrafficTactician/lib/imgui-docking/examples/libs/glfw/lib-vc2010-64/glfw3.lib - TrafficTactician/lib/imgui-docking/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx10.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/example_sdl2_sdlrenderer2.vcxproj.filters - TrafficTactician/lib/imgui-docking/.github/FUNDING.yml - TrafficTactician/lib/imgui-docking/.gitignore - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/Makefile.emscripten - TrafficTactician/lib/imgui-docking/examples/example_sdl2_directx11/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl2/Makefile - TrafficTactician/lib/imgui-docking/backends/imgui_impl_glut.h - TrafficTactician/lib/imgui-docking/misc/debuggers/README.txt - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_sdl2_vulkan/example_sdl2_vulkan.vcxproj.filters - TrafficTactician/lib/imgui-docking/misc/cpp/imgui_stdlib.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx12.h - TrafficTactician/lib/imgui-docking/examples/example_win32_directx12/example_win32_directx12.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/settings.gradle - TrafficTactician/lib/imgui-docking/imgui_draw.cpp - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_win32_directx11/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_glut_opengl2/example_glut_opengl2.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/CMakeLists.txt - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/build_win64.bat - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/iOS/Info-iOS.plist - TrafficTactician/lib/imgui-docking/misc/debuggers/imgui.natstepfilter - TrafficTactician/lib/imgui-docking/misc/cpp/imgui_stdlib.h - TrafficTactician/lib/imgui-docking/examples/example_win32_directx9/example_win32_directx9.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/app/src/main/java/MainActivity.kt - TrafficTactician/lib/imgui-docking/examples/example_win32_directx11/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/CMakeLists.txt - TrafficTactician/lib/imgui-docking/examples/example_win32_opengl3/example_win32_opengl3.vcxproj.filters - TrafficTactician/lib/imgui-docking/imstb_textedit.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_opengl3.cpp - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdlrenderer3.cpp - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/.gitignore - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/example_sdl3_opengl3.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdlrenderer2.cpp - TrafficTactician/lib/imgui-docking/imgui_demo.cpp - TrafficTactician/lib/imgui-docking/imgui.h - TrafficTactician/lib/imgui-docking/examples/example_win32_directx12/example_win32_directx12.vcxproj - TrafficTactician/lib/imgui-docking/examples/libs/usynergy/uSynergy.c - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/Makefile - TrafficTactician/lib/imgui-docking/.editorconfig - TrafficTactician/lib/imgui-docking/examples/libs/emscripten/shell_minimal.html - TrafficTactician/lib/imgui-docking/examples/example_win32_directx12/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/build_win32.bat - TrafficTactician/lib/imgui-docking/.github/workflows/scheduled.yml - TrafficTactician/lib/imgui-docking/backends/imgui_impl_metal.mm - TrafficTactician/lib/imgui-docking/examples/example_sdl2_vulkan/example_sdl2_vulkan.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_sdl2_vulkan/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/main.cpp - TrafficTactician/lib/imgui-docking/docs/EXAMPLES.md - TrafficTactician/lib/imgui-docking/examples/example_android_opengl3/android/app/build.gradle - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/Makefile - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx11.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_sdl2_metal/Makefile - TrafficTactician/lib/imgui-docking/examples/example_sdl2_directx11/example_sdl2_directx11.vcxproj - TrafficTactician/lib/imgui-docking/backends/imgui_impl_allegro5.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_opengl3.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx11.cpp - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/README.md - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/iOS/LaunchScreen.storyboard - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl2/build_win32.bat - TrafficTactician/lib/imgui-docking/.gitattributes - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdlrenderer2.h - TrafficTactician/lib/imgui-docking/examples/example_allegro5/README.md - TrafficTactician/lib/imgui-docking/examples/example_null/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_vulkan.h - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj - TrafficTactician/lib/imgui-docking/docs/CHANGELOG.txt - TrafficTactician/lib/imgui-docking/imconfig.h - TrafficTactician/lib/imgui-docking/examples/README.txt - TrafficTactician/lib/imgui-docking/examples/example_glut_opengl2/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_opengl3_loader.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_allegro5/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_null/Makefile - TrafficTactician/lib/imgui-docking/examples/example_glfw_metal/Makefile - TrafficTactician/lib/imgui-docking/imgui_widgets.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/README.md - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdl3.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdl3.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl3_sdlrenderer3/build_win32.bat - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdlrenderer3.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_directx11/main.cpp - TrafficTactician/lib/imgui-docking/examples/libs/usynergy/uSynergy.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/example_sdl2_sdlrenderer2.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_sdl3_sdlrenderer3/Makefile - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/README.md - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/build_win32.bat - TrafficTactician/lib/imgui-docking/backends/vulkan/glsl_shader.vert - TrafficTactician/lib/imgui-docking/backends/imgui_impl_wgpu.cpp - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/macOS/MainMenu.storyboard - TrafficTactician/lib/imgui-docking/examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj - TrafficTactician/lib/imgui-docking/imgui.cpp - TrafficTactician/lib/imgui-docking/examples/libs/glfw/lib-vc2010-32/glfw3.lib - TrafficTactician/lib/imgui-docking/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/README.md - TrafficTactician/lib/imgui-docking/examples/example_sdl3_sdlrenderer3/example_sdl3_sdlrenderer3.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_glfw_metal/main.mm - TrafficTactician/lib/imgui-docking/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters - TrafficTactician/stb_image.h - TrafficTactician/lib/imgui-docking/misc/freetype/imgui_freetype.cpp - TrafficTactician/lib/imgui-docking/examples/libs/usynergy/README.txt - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj - TrafficTactician/lib/imgui-docking/misc/fonts/Roboto-Medium.ttf - TrafficTactician/lib/imgui-docking/examples/libs/glfw/include/GLFW/glfw3native.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/example_sdl2_opengl2.vcxproj.filters - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdl2.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_osx.h - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/README.md - TrafficTactician/lib/imgui-docking/examples/example_apple_metal/macOS/Info-macOS.plist - TrafficTactician/lib/imgui-docking/examples/example_glut_opengl2/Makefile - TrafficTactician/lib/imgui-docking/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters - TrafficTactician/lib/imgui-docking/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_sdl3_sdlrenderer3/example_sdl3_sdlrenderer3.vcxproj - TrafficTactician/lib/imgui-docking/examples/libs/glfw/COPYING.txt - TrafficTactician/lib/imgui-docking/examples/example_win32_directx10/main.cpp - TrafficTactician/lib/imgui-docking/examples/example_win32_directx10/example_win32_directx10.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/Makefile - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_glfw.cpp - TrafficTactician/lib/imgui-docking/examples/example_sdl2_metal/main.mm - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl3/example_sdl2_opengl3.vcxproj - TrafficTactician/lib/imgui-docking/.github/pull_request_template.md - TrafficTactician/lib/imgui-docking/backends/imgui_impl_osx.mm - TrafficTactician/lib/imgui-docking/examples/example_allegro5/imconfig_allegro5.h - TrafficTactician/lib/imgui-docking/misc/fonts/binary_to_compressed_c.cpp - TrafficTactician/pikachu.jpg - TrafficTactician/lib/imgui-docking/.github/ISSUE_TEMPLATE/issue_template.yml - TrafficTactician/lib/imgui-docking/examples/example_sdl3_sdlrenderer3/main.cpp - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx9.cpp - TrafficTactician/lib/imgui-docking/examples/example_win32_opengl3/build_win32.bat - TrafficTactician/lib/imgui-docking/examples/example_sdl3_opengl3/Makefile.emscripten - TrafficTactician/lib/imgui-docking/docs/CONTRIBUTING.md - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/example_sdl2_opengl2.vcxproj - TrafficTactician/lib/imgui-docking/examples/example_null/build_win32.bat - TrafficTactician/lib/imgui-docking/backends/imgui_impl_opengl2.h - TrafficTactician/lib/imgui-docking/docs/README.md - TrafficTactician/lib/imgui-docking/docs/FONTS.md - TrafficTactician/lib/imgui-docking/examples/example_glfw_vulkan/build_win32.bat - TrafficTactician/lib/imgui-docking/backends/imgui_impl_dx10.h - TrafficTactician/lib/imgui-docking/examples/example_win32_opengl3/example_win32_opengl3.vcxproj - TrafficTactician/lib/imgui-docking/backends/imgui_impl_android.h - TrafficTactician/lib/imgui-docking/examples/example_sdl2_sdlrenderer2/Makefile - TrafficTactician/lib/imgui-docking/examples/imgui_examples.sln - TrafficTactician/lib/imgui-docking/examples/example_sdl2_opengl2/main.cpp - TrafficTactician/lib/imgui-docking/misc/fonts/ProggyTiny.ttf - TrafficTactician/lib/imgui-docking/misc/debuggers/imgui.gdb - TrafficTactician/lib/imgui-docking/backends/imgui_impl_sdl2.h - TrafficTactician/lib/imgui-docking/examples/example_win32_opengl3/main.cpp - TrafficTactician/lib/imgui-docking/imstb_truetype.h - TrafficTactician/lib/imgui-docking/backends/imgui_impl_opengl2.cpp For more information about what we're doing here, check out our docs: https://docs.gitbutler.com/features/virtual-branches/integration-branch
|
Merge AUB zelf de branch, ik weet niet welke versies ik moest kiezen bij het oplossen van de conflicten |
Yuichi135
approved these changes
May 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
According to the class demo, I changed the imgui calls to match the same style.