]> git.lizzy.rs Git - dragonfireclient.git/commit - builtin/settingtypes.txt
Merge branch 'master' of https://github.com/minetest/minetest
authorElias Fleckenstein <eliasfleckenstein@web.de>
Fri, 26 Mar 2021 13:00:57 +0000 (14:00 +0100)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Fri, 26 Mar 2021 13:00:57 +0000 (14:00 +0100)
commit880c9768a9323800ca8d44cc4b73e92278e58743
treecf5b0b340e7a02bff8e13ae364901b324114228b
parent83d09ffaf688aac9f2de67d06420572e4d0664dc
parent437d01196899f85bbc77d71123018aa26be337da
Merge branch 'master' of https://github.com/minetest/minetest
38 files changed:
.gitignore
CMakeLists.txt
LICENSE.txt
builtin/client/chatcommands.lua
builtin/client/death_formspec.lua
builtin/common/chatcommands.lua
builtin/game/item.lua
builtin/init.lua
builtin/mainmenu/dlg_contentstore.lua
builtin/mainmenu/pkgmgr.lua
builtin/mainmenu/tab_content.lua
builtin/mainmenu/tab_credits.lua
builtin/settingtypes.txt
doc/client_lua_api.txt
doc/lua_api.txt
misc/Info.plist
src/activeobjectmgr.h
src/client/camera.cpp
src/client/client.cpp
src/client/client.h
src/client/clientmap.cpp
src/client/content_cao.cpp
src/client/game.cpp
src/client/game.h
src/client/inputhandler.cpp
src/client/inputhandler.h
src/client/keys.h
src/client/mapblock_mesh.cpp
src/client/minimap.cpp
src/client/renderingengine.cpp
src/defaultsettings.cpp
src/gui/CMakeLists.txt
src/gui/guiKeyChangeMenu.cpp
src/network/clientpackethandler.cpp
src/nodedef.cpp
src/script/common/c_content.cpp
util/buildbot/buildwin32.sh
util/buildbot/buildwin64.sh