]> git.lizzy.rs Git - dragonfireclient.git/commit
Merge branch 'master' of https://github.com/minetest/minetest
authorElias Fleckenstein <eliasfleckenstein@web.de>
Thu, 13 May 2021 16:06:47 +0000 (18:06 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Thu, 13 May 2021 16:06:47 +0000 (18:06 +0200)
commitf3e741dad1311e0b4057b530386e246f921be52c
tree64581e3f0ddfa9d4740eed7b545fe3db87b8c126
parent96a37aed31cfb9c131e46eda80bdbe3d2289a546
parent69c70dd319532f7860f211f4a527a902b0386e49
Merge branch 'master' of https://github.com/minetest/minetest
40 files changed:
.luacheckrc
CMakeLists.txt
LICENSE.txt
builtin/common/misc_helpers.lua
builtin/game/item.lua
builtin/mainmenu/init.lua
builtin/mainmenu/tab_about.lua
builtin/settingtypes.txt
doc/client_lua_api.txt
doc/lua_api.txt
src/client/camera.cpp
src/client/camera.h
src/client/client.cpp
src/client/client.h
src/client/clientenvironment.cpp
src/client/clientmap.cpp
src/client/clientobject.h
src/client/content_cao.cpp
src/client/content_cao.h
src/client/game.cpp
src/client/game.h
src/client/gameui.cpp
src/client/hud.cpp
src/client/inputhandler.cpp
src/client/keys.h
src/client/mapblock_mesh.cpp
src/client/minimap.cpp
src/client/render/core.cpp
src/client/renderingengine.cpp
src/defaultsettings.cpp
src/gui/cheatMenu.cpp
src/gui/guiKeyChangeMenu.cpp
src/nodedef.cpp
src/script/common/c_content.cpp
src/script/common/c_content.h
src/script/cpp_api/s_security.cpp
src/script/lua_api/l_mainmenu.cpp
src/script/lua_api/l_util.cpp
util/buildbot/buildwin32.sh
util/buildbot/buildwin64.sh