From f6f09d5409c99a60036a6655339588d6c58d1257 Mon Sep 17 00:00:00 2001 From: darkrose Date: Sun, 28 Apr 2013 18:53:32 +1000 Subject: [PATCH] we are minetest-classic --- README.txt | 24 ++++++++++------- doc/changelog.txt | 61 ++++++++++++++++++++++++++++++++------------ src/game.cpp | 4 +-- src/guiPauseMenu.cpp | 18 +++---------- src/main.cpp | 5 ---- 5 files changed, 64 insertions(+), 48 deletions(-) diff --git a/README.txt b/README.txt index 0603924..50dce03 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,8 @@ -Minetest-c55 +Minetest-Classic --------------- An InfiniMiner/Minecraft inspired game. Copyright (c) 2010-2011 Perttu Ahola +Forked from Minetest 0.3.x by Lisa 'darkrose' Milne (see source files for other contributors) Further documentation: @@ -93,8 +94,8 @@ Compiling on Windows: * Optional: gettext bibrary and tools: http://gnuwin32.sourceforge.net/downlinks/gettext.php - This is used for other UI languages. Feel free to leave it out. - * And, of course, Minetest-c55: - http://celeron.55.lt/~celeron55/minetest/download + * And, of course, Minetest-Classic: + https://gitorious.org/minetest-classic/minetest-classic/archive-tarball/master - Steps: - Select a directory called DIR hereafter in which you will operate. - Make sure you have CMake and a compiler installed. @@ -195,23 +196,23 @@ cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DR "C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release popd -License of Minetest-c55 textures +License of Minetest-Classic textures -------------------------------- This does not apply to texture packs made by others. -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) http://creativecommons.org/licenses/by-sa/3.0/ -License of Minetest-c55 +License of Minetest-Classic ----------------------- -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest-Classic +Copyright (C) 2010-2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -223,6 +224,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Minetest-c55 was licensed under GPLv2 or later, the 'or later' option + was taken by Lisa 'darkrose' Milne when forking Minetest-Classic, thus + updating the license to GPLv3 + Irrlicht --------------- diff --git a/doc/changelog.txt b/doc/changelog.txt index b27fc50..9e51542 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -3,13 +3,23 @@ Minetest-c55 changelog This should contain all the major changes. For minor stuff, refer to the commit log of the repository. +Classic: (initial fork April 2013) +- Leaf and apple decay, +junglegrass and papyrus now grow +- Fixed inventory cube rendering +- Added support for irrlicht 1.8 +- remove CONTENT_CLOUD, replace with CONTENT_COTTON - crafted from + junglegrass + 0.3.1: (released on 2011-11-09) -- Fix frustum culling (previous versions have rendered too much stuff that is not actually visible (about 180 degrees, while should have been more like 100.)) +- Fix frustum culling (previous versions have rendered too much stuff + that is not actually visible (about 180 degrees, while should have been + more like 100.)) - Add occlusion culling (improves performance a lot) - Add “3d clouds” on/off checkbox in main menu - Add “opaque water” on/off checkbox - Fix some random minor stuff -- Turn mipmapping off (This makes far-away textures a bit noisier but better looking) +- Turn mipmapping off (This makes far-away textures a bit noisier but + better looking) - Add Command-line signal handler for Windows (contributed by SpeedProg) - Fix network layer segmentation fault introduced in 0.3.dev-20111021 - Fix water-glass and water-lava and lava-glass surfaces @@ -25,7 +35,8 @@ For minor stuff, refer to the commit log of the repository. - Server user limit setting (max_users) - Wielded tool is shown in HUD (contributed) - View bobbing (contributed) -- Saplings that drop from leaf blocks and when placed on ground will grow to trees (contributed) +- Saplings that drop from leaf blocks and when placed on ground will + grow to trees (contributed) - Optimized map saving (does not re-save everything all the time) - New mob system and new mob: dungeon master - Death/respawn screen @@ -34,7 +45,8 @@ For minor stuff, refer to the commit log of the repository. - Fix the build for MSVC2010; also released for windows using MSVC2010. 0.2.20110922_1: -- Make client report a newer version number to the server than 2011-07-31 does and make server disallow old clients +- Make client report a newer version number to the server than + 2011-07-31 does and make server disallow old clients 0.2.20110922: - Map is saved in an SQLite database file (by Queatz) @@ -43,29 +55,35 @@ For minor stuff, refer to the commit log of the repository. - Apple trees (sfan5) - Slightly better looking inventory with transparency - /me chat command (Oblomov) -- Using chosen map seed possible through fixed_map_seed configuration option (kahrl) +- Using chosen map seed possible through fixed_map_seed configuration + option (kahrl) - Fix the long-existed PeerNotFound loop bug - Some translations and localization-related fixes - Lots of small fixes 2011-07-31_3: -- Fixes a bug that made the server to deny non-empty passwords from players connecting the first time +- Fixes a bug that made the server to deny non-empty passwords from + players connecting the first time 2011-07-31_2: -- Fixes a bug that caused the server to always read an empty password from the client when a client connected. +- Fixes a bug that caused the server to always read an empty password + from the client when a client connected. 2011-07-31: -- A number of small fixes, build system stuff and such (refer to version control log) +- A number of small fixes, build system stuff and such (refer to version + control log) - Map generator no longer crashes at generation limit - Fixed mapgen producing lots of cut-down trees - Some minor tweaks in map generator (some contributed) - Volumetric clouds (contributed) - Icon added (graphic contributed) - Key configuration menu (contributed) -- Decorative blocks and items: bookshelf, sandstone, cactus, clay, brick, papyrus, rail, paper, book (contributed) +- Decorative blocks and items: bookshelf, sandstone, cactus, clay, + brick, papyrus, rail, paper, book (contributed) - Jungles! - Hotbar is a bit smaller -- Health is now enabled by default; You can now eat cooked rats to heal yourself. +- Health is now enabled by default; You can now eat cooked rats to heal + yourself. - Finally added sword textures, altough sword is still of no use - Creative mode now preserves normal mode inventory @@ -89,7 +107,8 @@ For minor stuff, refer to the commit log of the repository. - Slightly updated map format - Player passwords - All textures first searched from texture_path -- Map directory ("map") has been renamed to "world" (just rename it to load an old world) +- Map directory ("map") has been renamed to "world" (just rename it to + load an old world) - Mouse inversion (invert_mouse) - Grass doesn't grow immediately anymore - Fence added @@ -102,7 +121,8 @@ For minor stuff, refer to the commit log of the repository. - Small bug fixes - Item drop multiplication fixed - HP added -- Added A simple monster which spawns to dark places at map generation time +- Added A simple monster which spawns to dark places at map generation + time - Some code refactoring and cleaning (possibly new bugs) 2011-04-11: @@ -113,8 +133,11 @@ For minor stuff, refer to the commit log of the repository. - New object system 2011-04-06: -- Mesh update of node addition/removal is now done asynchronously on client, removing frametime spike -- Node addition/removal is sent directly only to clients that are closer than 100 nodes to the modification. For the others, the modified blocks are set unsent. (and are re-sent when applicable) +- Mesh update of node addition/removal is now done asynchronously on + client, removing frametime spike +- Node addition/removal is sent directly only to clients that are closer + than 100 nodes to the modification. For the others, the modified blocks + are set unsent. (and are re-sent when applicable) 2011-04-05: - Made furnace usable @@ -123,18 +146,22 @@ For minor stuff, refer to the commit log of the repository. - Incremented to version 0.0.2 2011-04-04: -- Cleaned client to be completely synchronous, except for the mesh calculation, which is now done with queues in a separate thread. +- Cleaned client to be completely synchronous, except for the mesh + calculation, which is now done with queues in a separate thread. - Added node metadata support - Added chests 2011-02-17: -- Added better handling of textures. Now many file extensions are searched. Also too large textures are not put on the texture atlas, and the construction of the texture atlas is stopped when it is full. +- Added better handling of textures. Now many file extensions are + searched. Also too large textures are not put on the texture atlas, + and the construction of the texture atlas is stopped when it is full. 2011-02-16: - Better handling of Ctrl-C on POSIX systems 2011-02-15: -- Fixed a problem of not saving and loading the "lighting expired" value of MapBlocks properly. This caused high server CPU usage. +- Fixed a problem of not saving and loading the "lighting expired" value + of MapBlocks properly. This caused high server CPU usage. - Ctrl-C handling on POSIX systems - Added simple command support to server - Added settings enable_texture_atlas and texture_path diff --git a/src/game.cpp b/src/game.cpp index e1f88ff..e4d587f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -864,7 +864,7 @@ void the_game( // First line of debug text gui::IGUIStaticText *guitext = guienv->addStaticText( - L"Minetest-c55", + L"Minetest-Classic", core::rect(5, 5, 795, 5+text_height), false, false); // Second line of debug text @@ -2058,7 +2058,7 @@ void the_game( endscenetime_avg = endscenetime_avg * 0.95 + (float)endscenetime*0.05; char temptext[300]; - snprintf(temptext, 300, "Minetest-c55 %s (" + snprintf(temptext, 300, "Minetest-Classic %s (" "R: range_all=%i" ")" " drawtime=%.0f, beginscenetime=%.0f" diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp index 34106b0..95c82f1 100644 --- a/src/guiPauseMenu.cpp +++ b/src/guiPauseMenu.cpp @@ -164,23 +164,11 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize) max_texture_size = driver->getMaxTextureSize(); } - /*wchar_t text[200]; - swprintf(text, 200, - L"Minetest-c55\n" - L"by Perttu Ahola\n" - L"celeron55@gmail.com\n\n" - SWPRINTF_CHARSTRING L"\n" - L"userdata path = " - SWPRINTF_CHARSTRING - , - BUILD_INFO, - porting::path_userdata.c_str() - );*/ - std::ostringstream os; - os<<"Minetest\n"; - os<<"by Perttu Ahola and contributors\n"; + os<<"Minetest-Classic\n"; + os<<"by Perttu Ahola, darkrose and contributors\n"; os<<"celeron55@gmail.com\n"; + os<<"lisa@ltmnet.com\n"; os<clear(); - // Reset or hide the debug gui texts - /*guitext->setText(L"Minetest-c55"); - guitext2->setVisible(false); - guitext_info->setVisible(false); - guitext_chat->setVisible(false);*/ // Initialize menu data MainMenuData menudata;