Merge develop into rich-presence (#30)
* Bump deps/asmjit from `6efd4d5` to `f1a399c`
Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `6efd4d5` to `f1a399c`.
- [Release notes](https://github.com/asmjit/asmjit/releases)
- [Commits](6efd4d563d...f1a399c4fe
)
---
updated-dependencies:
- dependency-name: deps/asmjit
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
* Custom material stupport
* Remove this
* Dont try to load 'white' material
* removed git protocol submodules [skip ci]
* readd submodules via http protocol
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Cecchetto <fedecek3@gmail.com>
Co-authored-by: fed <58637860+fedddddd@users.noreply.github.com>
This commit is contained in:
15
.gitmodules
vendored
15
.gitmodules
vendored
@ -28,19 +28,20 @@
|
||||
[submodule "deps/stb"]
|
||||
path = deps/stb
|
||||
url = https://github.com/nothings/stb.git
|
||||
branch = develop
|
||||
[submodule "deps/libtomcrypt"]
|
||||
path = deps/libtomcrypt
|
||||
url = git://github.com/libtom/libtomcrypt.git
|
||||
branch = develop
|
||||
[submodule "deps/zlib"]
|
||||
path = deps/zlib
|
||||
url = git://github.com/madler/zlib.git
|
||||
url = https://github.com/libtom/libtomcrypt.git
|
||||
branch = develop
|
||||
[submodule "deps/libtommath"]
|
||||
path = deps/libtommath
|
||||
url = git://github.com/libtom/libtommath.git
|
||||
url = https://github.com/libtom/libtommath.git
|
||||
branch = develop
|
||||
[submodule "deps/protobuf"]
|
||||
path = deps/protobuf
|
||||
url = git://github.com/protocolbuffers/protobuf.git
|
||||
url = https://github.com/protocolbuffers/protobuf.git
|
||||
branch = 3.17.x
|
||||
[submodule "deps/zlib"]
|
||||
path = deps/zlib
|
||||
url = https://github.com/madler/zlib.git
|
||||
branch = develop
|
||||
|
Reference in New Issue
Block a user