Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Xiao Qi 2022-09-05 13:55:06 +08:00
commit 40327f15f6
3 changed files with 4 additions and 8 deletions

9
.gitmodules vendored
View File

@ -7,18 +7,12 @@
[submodule "Dependencies/imguizmo"] [submodule "Dependencies/imguizmo"]
path = Dependencies/imguizmo path = Dependencies/imguizmo
url = https://github.com/SHADE-DP/ImGuizmo.git url = https://github.com/SHADE-DP/ImGuizmo.git
[submodule "Dependencies/imnodes"]
path = Dependencies/imnodes
url = https://github.com/SHADE-DP/imnodes.git
[submodule "Dependencies/tracy"] [submodule "Dependencies/tracy"]
path = Dependencies/tracy path = Dependencies/tracy
url = https://github.com/SHADE-DP/tracy.git url = https://github.com/SHADE-DP/tracy.git
[submodule "Dependencies/spdlog"] [submodule "Dependencies/spdlog"]
path = Dependencies/spdlog path = Dependencies/spdlog
url = https://github.com/SHADE-DP/spdlog.git url = https://github.com/SHADE-DP/spdlog.git
[submodule "Dependencies/stb"]
path = Dependencies/stb
url = https://github.com/SHADE-DP/stb.git
[submodule "Dependencies/msdf"] [submodule "Dependencies/msdf"]
path = Dependencies/msdf path = Dependencies/msdf
url = https://github.com/SHADE-DP/msdf-atlas-gen.git url = https://github.com/SHADE-DP/msdf-atlas-gen.git
@ -28,3 +22,6 @@
[submodule "Dependencies/assimp"] [submodule "Dependencies/assimp"]
path = Dependencies/assimp path = Dependencies/assimp
url = https://github.com/assimp/assimp.git url = https://github.com/assimp/assimp.git
[submodule "Dependencies/imnodes"]
path = Dependencies/imnodes
url = https://github.com/SHADE-DP/imnodes.git

@ -1 +1 @@
Subproject commit d88f99125bb72cdb71b4c27ff6eb7f318d89a4c5 Subproject commit 411951be7486862a835178917c5f380a9c0c815e

1
Dependencies/stb vendored

@ -1 +0,0 @@
Subproject commit af1a5bc352164740c1cc1354942b1c6b72eacb8a