Merge remote-tracking branch 'origin/master'
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- README.txt 12 additions, 8 deletionsREADME.txt
- builtin/features.lua 5 additions, 5 deletionsbuiltin/features.lua
- doc/lua_api.txt 11 additions, 0 deletionsdoc/lua_api.txt
- doc/minetest.6 3 additions, 0 deletionsdoc/minetest.6
- games/minimal/menu/background.png 0 additions, 0 deletionsgames/minimal/menu/background.png
- games/minimal/menu/icon.png 0 additions, 0 deletionsgames/minimal/menu/icon.png
- minetest.conf.example 2 additions, 0 deletionsminetest.conf.example
- src/client.cpp 18 additions, 1 deletionsrc/client.cpp
- src/client.h 1 addition, 1 deletionsrc/client.h
- src/clientserver.h 4 additions, 4 deletionssrc/clientserver.h
- src/defaultsettings.cpp 1 addition, 0 deletionssrc/defaultsettings.cpp
- src/environment.cpp 8 additions, 9 deletionssrc/environment.cpp
- src/game.cpp 227 additions, 81 deletionssrc/game.cpp
- src/guiChatConsole.cpp 1 addition, 0 deletionssrc/guiChatConsole.cpp
- src/guiConfigureWorld.cpp 17 additions, 5 deletionssrc/guiConfigureWorld.cpp
- src/guiCreateWorld.cpp 12 additions, 3 deletionssrc/guiCreateWorld.cpp
- src/guiCreateWorld.h 3 additions, 1 deletionsrc/guiCreateWorld.h
- src/guiMainMenu.cpp 86 additions, 29 deletionssrc/guiMainMenu.cpp
- src/guiMainMenu.h 15 additions, 0 deletionssrc/guiMainMenu.h
Loading
Please register or sign in to comment