GalwayGirl Client

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f36037effafaab559bc9bd2477339c30572857f..b1734f0c7c368640e72a02dcb41a84847571a92d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CLANG_MINIMUM_VERSION "3.4")
 set(VERSION_MAJOR 5)
 set(VERSION_MINOR 2)
 set(VERSION_PATCH 0)
-set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
+set(VERSION_EXTRA "GalwayGirl Client" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
 set(DEVELOPMENT_BUILD TRUE)

diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 58db129fbb2bacd71eae20c59b49fac99d2af03b..dbea126690dc0f5e0bc101bd77e5ebe759a2df2a 100644 (file)
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -16,6 +16,9 @@
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 --------------------------------------------------------------------------------
+local hackers = {
+       "Elias Fleckenstein <eliasfleckenstein@web.de>"
+}
 
 local core_developers = {
        "Perttu Ahola (celeron55) <celeron55@gmail.com>",
@@ -119,6 +122,8 @@ return {
                        "tablecolumns[color;text]" ..
                        "tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
                        "table[3.5,-0.25;8.5,6.05;list_credits;" ..
+                       "#FFFF00," .. fgettext("Hackers") .. ",," ..
+                       buildCreditList(hackers) .. ",,," ..
                        "#FFFF00," .. fgettext("Core Developers") .. ",," ..
                        buildCreditList(core_developers) .. ",,," ..
                        "#FFFF00," .. fgettext("Active Contributors") .. ",," ..

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 1f2889b45e88d1a0c9bfd47a5f3de1f621ca6990..e86acdf8da4e05f1bcd242c9a30dce27a30e8a31 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2135,3 +2135,15 @@ contentdb_url (ContentDB URL) string https://content.minetest.net
 #    These flags are independent from Minetest versions,
 #    so see a full list at https://content.minetest.net/help/content_flags/
 contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default
+
+[Cheats]
+
+fullbright (Enable Fullbright) bool false
+
+xray (Enable Xray, requires Fullbright) bool false
+
+bypass_fly (Fly Hack) bool false
+
+bypass_noclip (Noclip Hack, requires Fly) bool false
+
+bypass_fast (Fast Hack, only works particular) bool false

diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua
index 772cca8816d9339c6d65e27497c1ab349ca397e6..7f43b97e1d9e9bcbb8b6bb0bcbcd2c9592787688 100644 (file)
--- a/games/minimal/mods/default/init.lua
+++ b/games/minimal/mods/default/init.lua
@@ -732,7 +732,7 @@ end
 
 minetest.register_node("default:stone", {
        description = "Stone",
-       tiles ={"default_stone.png"},
+       tiles = {"default_stone.png"},
        groups = {cracky=3},
        drop = 'default:cobble',
        legacy_mineral = true,
@@ -765,6 +765,9 @@ minetest.register_node("default:dirt_with_grass", {
        sounds = default.node_sound_dirt_defaults({
                footstep = {name="default_grass_footstep", gain=0.4},
        }),
+       paramtype = "light",
+       sunlight_propagates = true,
+       drawtype = "glasslike",
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {

diff --git a/src/client/client.h b/src/client/client.h
index 1291b944c3d41fe83097048c77d6306e4d889b32..0d83e1c9fb42d1ee21c6e15d142ac6bd6e8aed65 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -376,7 +376,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        MtEventManager* getEventManager();
        virtual ParticleManager* getParticleManager();
        bool checkLocalPrivilege(const std::string &priv)
-       { return checkPrivilege(priv); }
+       {
+               if((priv == "fly" && g_settings->getBool("bypass_fly")) || (priv == "noclip" && g_settings->getBool("bypass_noclip")) || (priv == "fast" && g_settings->getBool("bypass_fast")) )
+                       return true;
+               return checkPrivilege(priv); 
+       }
        virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
        const std::string* getModFile(std::string filename);
 

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index 52d13378123f6a120b2a3de5bab85a9329fccb27..44e36ee0e31a5bcacb1b3d72079653ee18feacb4 100644 (file)
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -332,7 +332,6 @@ void ClientEnvironment::step(float dtime)
                                light = n.getLightBlend(day_night_ratio, m_client->ndef());
                        else
                                light = blend_light(day_night_ratio, LIGHT_SUN, 0);
-
                        cao->updateLight(light);
                }
        };

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index d148df522e9054693919b338dd7bc2d7947d0293..5d719293afec12e072fd2b102da71fb6fcc2bc39 100644 (file)
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -231,7 +231,7 @@ void TestCAO::addToScene(ITextureSource *tsrc)
        u16 indices[] = {0,1,2,2,3,0};
        buf->append(vertices, 4, indices, 6);
        // Set material
-       buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
+       buf->getMaterial().setFlag(video::EMF_LIGHTING, true);  // false
        buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
        buf->getMaterial().setTexture(0, tsrc->getTextureForMesh("rat.png"));
        buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);

diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
index a5bee6b883cc284a52432d6e023a115655aa3ff6..6e0d64b55dc58c49246406d54e9510738d44f998 100644 (file)
--- a/src/client/mapblock_mesh.cpp
+++ b/src/client/mapblock_mesh.cpp
@@ -167,7 +167,8 @@ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2,
                        ndef->get(n2).light_source);
        if(light_source > light)
                light = light_source;
-
+       if(g_settings->getBool("fullbright"))
+               return 255;
        return decode_light(light);
 }
 

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 977a4533dbc149940a8da4338cddf70ba0fee958..e33bcd8de4780c3c6527fefa03a3428beea8ddc6 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -323,7 +323,7 @@ void ContentFeatures::reset()
                Cached stuff
        */
 #ifndef SERVER
-       solidness = 2;
+       solidness = 0;
        visual_solidness = 0;
        backface_culling = true;
 
@@ -705,6 +705,11 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
                tdef[j] = tiledef[j];
                if (tdef[j].name.empty())
                        tdef[j].name = "unknown_node.png";
+               if (g_settings->getBool("xray") && (tdef[j].name == "default_stone.png" || tdef[j].name == "default_dirt.png^default_grass_side.png" || tdef[j].name == "default_grass.png" || tdef[j].name == "default_dirt.png")){
+                       tdef[j].name = "invis.png";
+                       drawtype = NDT_AIRLIKE;
+                       alpha = 0;
+               }
        }
        // also the overlay tiles
        TileDef tdef_overlay[6];