From 28938c8ee68e5a2559674f0ead98719224cea2cd Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 19 Jun 2020 12:28:17 +0200 Subject: [PATCH] =?UTF-8?q?Add=20=E2=80=9Cupdate=20=3D=20merge=E2=80=9D=20?= =?UTF-8?q?and=20=E2=80=9Cupstream=E2=80=9D=20entries=20for=20submodules.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 26 ++++++++++++++++++++------ lol | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index aa769c48..39bf7202 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,28 +1,42 @@ # The “lol” header-only framework [submodule "lol"] path = lol - url = https://github.com/lolengine/lol.git + url = https://github.com/lolengine/lol branch = master + update = merge # A very large repository with Windows binaries [submodule "external"] path = external - url = https://gitea.zoy.org/lolengine/binaries.git + url = https://gitea.zoy.org/lolengine/binaries branch = master + update = merge # Some libraries we embed in the engine [submodule "imgui"] path = src/3rdparty/imgui - url = ../../lolengine/ext-imgui.git + url = https://github.com/lolengine/ext-imgui branch = master + update = merge + upstream = https://github.com/ocornut/imgui + [submodule "bullet3"] path = src/3rdparty/bullet3 - url = ../../lolengine/ext-bullet3.git + url = https://github.com/lolengine/ext-bullet3 branch = lol + update = merge + upstream = https://github.com/bulletphysics/bullet3 + [submodule "lua"] path = src/3rdparty/lua - url = ../../lolengine/ext-lua.git + url = https://github.com/lolengine/ext-lua branch = lol + update = merge + upstream = https://github.com/lua/lua + [submodule "cpp-httplib"] path = src/3rdparty/cpp-httplib - url = ../../lolengine/ext-cpp-httplib.git + url = https://github.com/lolengine/ext-cpp-httplib + branch = master + update = merge + upstream = https://github.com/yhirose/cpp-httplib diff --git a/lol b/lol index 46f0426a..2ff9562b 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit 46f0426adeac4d9aadde1aacccce552f16590c14 +Subproject commit 2ff9562bacfe192da450fd82727406bcd48200f5