This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/builtin/falling.lua b/builtin/falling.lua | |
index 7308780..7bf29f1 100644 | |
--- a/builtin/falling.lua | |
+++ b/builtin/falling.lua | |
@@ -156,7 +156,10 @@ function nodeupdate_single(p, delay) | |
minetest.after(0.1, nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false) | |
else | |
minetest.remove_node(p) | |
- spawn_falling_node(p, n.name) | |
+ -- Spawn entity in next step to avoid lighting glitches |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main.cpp b/src/main.cpp | |
index 8ed164d..4a6d83e 100644 | |
--- a/src/main.cpp | |
+++ b/src/main.cpp | |
@@ -1535,6 +1535,18 @@ int main(int argc, char *argv[]) | |
std::string current_address = "does-not-exist"; | |
int current_port = 0; | |
+ MenuMusicFetcher soundfetcher; | |
+ ISoundManager *sound = NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt | |
index 164d787..6d0a7a5 100644 | |
--- a/doc/menu_lua_api.txt | |
+++ b/doc/menu_lua_api.txt | |
@@ -57,6 +57,8 @@ engine.get_modstore_list() | |
} | |
engine.get_gamepath() | |
^ returns path to global gamepath | |
+engine.get_texturepath() | |
+^ returns the path to the install directory of texture packs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[code]textures/ | |
├── HDX/ | |
│ ├── info.txt | |
│ ├── screenshot.png | |
│ ├── default_wood.png | |
│ └── ... | |
└── Misa/ | |
├── info.txt | |
├── screenshot.png | |
├── default_brick.png |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/fonts/fontdejavusansmono.png b/fonts/fontdejavusansmono.png | |
new file mode 100644 | |
index 0000000..02ad413 | |
Binary files /dev/null and b/fonts/fontdejavusansmono.png differ | |
diff --git a/fonts/fontlucida.png b/fonts/fontlucida.png | |
new file mode 100644 | |
index 0000000..ab7bb70 | |
Binary files /dev/null and b/fonts/fontlucida.png differ | |
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp | |
index 33adf10..c07185b 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/fonts/fontdejavusansmono.png b/fonts/fontdejavusansmono.png | |
new file mode 100644 | |
index 0000000..02ad413 | |
Binary files /dev/null and b/fonts/fontdejavusansmono.png differ | |
diff --git a/fonts/fontlucida.png b/fonts/fontlucida.png | |
new file mode 100644 | |
index 0000000..ab7bb70 | |
Binary files /dev/null and b/fonts/fontlucida.png differ | |
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp | |
index 33adf10..aac2516 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 5c8753e..2db4e4a 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -153,7 +153,7 @@ if(BUILD_CLIENT) | |
endif() | |
if(RUN_IN_PLACE) | |
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods") | |
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/all/textures_here.txt" DESTINATION "${SHAREDIR}/textures/all") | |
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua | |
index e000e66..610926e 100644 | |
--- a/builtin/mainmenu.lua | |
+++ b/builtin/mainmenu.lua | |
@@ -864,7 +864,11 @@ function tabbuilder.init() | |
end | |
end | |
- menu.update_gametype() | |
+ if tabbuilder.current_tab ~= "singleplayer" then |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22:56:54: ERROR[main]: ========== ERROR FROM LUA =========== | |
22:56:54: ERROR[main]: Failed to load and run script from | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua: | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua:1056: attempt to concatenate global 'texture_pack_path' (a nil value) | |
22:56:54: ERROR[main]: stack traceback: | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua:1056: in function 'tab_texture_packs' | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua:345: in function 'gettab' | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua:161: in function 'update_menu' | |
22:56:54: ERROR[main]: /home/adam/Minetest/minetest/bin/../builtin/mainmenu.lua:1236: in main chunk | |
22:56:54: ERROR[main]: =======END OF ERROR FROM LUA ======== |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/doc/lua_api.txt b/doc/lua_api.txt | |
index bd465bb..4347b3a 100644 | |
--- a/doc/lua_api.txt | |
+++ b/doc/lua_api.txt | |
@@ -1863,7 +1863,8 @@ Object Properties | |
makes_footstep_sound = false, | |
automatic_rotate = false, | |
stepheight = 0, | |
- automatic_face_movement_dir = false, | |
+ automatic_face_movement_dir = 0.0, |