]> git.lizzy.rs Git - dragonfireclient.git/commit
Merge branch 'master' of https://github.com/minetest/minetest
authorElias Fleckenstein <eliasfleckenstein@web.de>
Thu, 7 Jan 2021 11:35:04 +0000 (12:35 +0100)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Thu, 7 Jan 2021 11:35:04 +0000 (12:35 +0100)
commitcca4254f7c502b3e75691c6a3087da7cfcd72e28
treee71b47442e77e09ca17e2c9c121a455f9deeace2
parent4fedc3a31ee20813e4c81377b3bd2af05a26b858
parent58a709096ef8ff17644cf201f25b1831d9506514
Merge branch 'master' of https://github.com/minetest/minetest
27 files changed:
CMakeLists.txt
builtin/common/misc_helpers.lua
builtin/mainmenu/dlg_contentstore.lua
builtin/mainmenu/init.lua
builtin/mainmenu/tab_credits.lua
builtin/settingtypes.txt
doc/lua_api.txt
src/client/camera.cpp
src/client/clientenvironment.cpp
src/client/clientmap.cpp
src/client/content_cao.cpp
src/client/game.cpp
src/client/game.h
src/client/inputhandler.h
src/client/mapblock_mesh.cpp
src/client/minimap.cpp
src/defaultsettings.cpp
src/gui/CMakeLists.txt
src/map.cpp
src/map.h
src/network/networkprotocol.h
src/nodedef.cpp
src/script/cpp_api/s_security.cpp
src/script/lua_api/l_env.cpp
src/script/lua_api/l_env.h
src/script/lua_api/l_mainmenu.cpp
src/script/lua_api/l_util.cpp