From 0e3a5413ce692b34fa7194e02b6acfcfb7034813 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 21:03:26 -0700 Subject: [PATCH 1/6] Update Map Submodule (#904) Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `fa7fa3e` to `6afcf12`. - [Release notes](https://github.com/MT-CTF/maps/releases) - [Commits](https://github.com/MT-CTF/maps/compare/fa7fa3e8f80dd82d6e98766581269817325e546b...6afcf12e1ca22873fc4066b242f57b8398131745) --- updated-dependencies: - dependency-name: mods/ctf/ctf_map/ctf_map_core/maps dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mods/ctf/ctf_map/ctf_map_core/maps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps index fa7fa3e..6afcf12 160000 --- a/mods/ctf/ctf_map/ctf_map_core/maps +++ b/mods/ctf/ctf_map/ctf_map_core/maps @@ -1 +1 @@ -Subproject commit fa7fa3e8f80dd82d6e98766581269817325e546b +Subproject commit 6afcf12e1ca22873fc4066b242f57b8398131745 From 3736223110c37d81460c9eec66d7b3270d6ca3c9 Mon Sep 17 00:00:00 2001 From: _Lucy <80708819+Lucyucy@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:49:14 +0200 Subject: [PATCH 2/6] Make stairs diggable with paxel (#905) * Making stairs diggable with the paxel Adds cobble stairs and desert cobble stairs to local function "isdiggable" and "remove_pillar" * Update mods/ctf/ctf_classes/medic.lua Co-authored-by: LoneWolfHT --- mods/ctf/ctf_classes/medic.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index de07c13..5bb2287 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -150,6 +150,7 @@ local function isdiggable(name) name:find("glass" ) or name:find("ice" ) or name:find("snow" ) ) + or name:find("stairs:") end local function paxel_stop(pname, reason) @@ -165,7 +166,7 @@ end local function remove_pillar(pos, pname) local name = minetest.get_node(pos).name - if name:find("default") and isdiggable(name) then + if name:find("default") or name:find("stairs") and isdiggable(name) then local player = minetest.get_player_by_name(pname) minetest.dig_node(pos) From 24c267c3b84044daea66995a41156f863cd94b0e Mon Sep 17 00:00:00 2001 From: ksandr <65916671+ksandronline@users.noreply.github.com> Date: Mon, 5 Jul 2021 23:54:47 +0300 Subject: [PATCH 3/6] Colorize leave messages (#909) * add leave message * Update mods/ctf/ctf_leave_message/init.lua Co-authored-by: David Leal * Update mods/ctf/ctf_leave_message/init.lua Co-authored-by: David Leal * Update mods/ctf/ctf_leave_message/mod.conf Co-authored-by: David Leal * Update mods/ctf/ctf_leave_message/init.lua Co-authored-by: David Leal * Update mods/ctf/ctf_leave_message/init.lua okay. Co-authored-by: David Leal * Update mods/ctf/ctf_leave_message/init.lua Co-authored-by: LoneWolfHT Co-authored-by: David Leal Co-authored-by: LoneWolfHT --- mods/ctf/ctf_leave_message/init.lua | 10 ++++++++++ mods/ctf/ctf_leave_message/mod.conf | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 mods/ctf/ctf_leave_message/init.lua create mode 100644 mods/ctf/ctf_leave_message/mod.conf diff --git a/mods/ctf/ctf_leave_message/init.lua b/mods/ctf/ctf_leave_message/init.lua new file mode 100644 index 0000000..c2b185d --- /dev/null +++ b/mods/ctf/ctf_leave_message/init.lua @@ -0,0 +1,10 @@ +function minetest.send_leave_message(player_name, timed_out) + local player = ctf.player(player_name) + local tcolor = ctf_colors.get_color(player).css + + local announcement = "*** " .. minetest.colorize(tcolor, player_name) .. " left the game." + if timed_out then + announcement = announcement .. " (timed out)" + end + minetest.chat_send_all(announcement) +end diff --git a/mods/ctf/ctf_leave_message/mod.conf b/mods/ctf/ctf_leave_message/mod.conf new file mode 100644 index 0000000..87ca448 --- /dev/null +++ b/mods/ctf/ctf_leave_message/mod.conf @@ -0,0 +1,3 @@ +name = ctf_leave_message +depends = ctf, ctf_colors +description = Colorizes leaving messages From b255cb3fbc039adf2b33dbf3041d4f5708df4c5f Mon Sep 17 00:00:00 2001 From: Toby1710 <69259430+DiamondPlane@users.noreply.github.com> Date: Sun, 18 Jul 2021 19:24:45 +0300 Subject: [PATCH 4/6] Fix vote not clearing on new match (#908) --- mods/ctf/ctf_match/vote.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_match/vote.lua b/mods/ctf/ctf_match/vote.lua index 2bfc622..cb59263 100644 --- a/mods/ctf/ctf_match/vote.lua +++ b/mods/ctf/ctf_match/vote.lua @@ -53,7 +53,7 @@ function ctf_match.vote_next(name) }) end -ctf_match.register_on_new_match(vote.clear_vote) +ctf_match.register_on_new_match(vote.clear) minetest.register_chatcommand("vote", { privs = { From e3cf542aec72a3bdfd6c3b792a354ca159355753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 18 Jul 2021 10:23:33 -0700 Subject: [PATCH 5/6] Update shooter submodule (#911) Bumps [mods/pvp/shooter](https://github.com/MT-CTF/shooter) from `6939ab0` to `d4a450c`. - [Release notes](https://github.com/MT-CTF/shooter/releases) - [Commits](https://github.com/MT-CTF/shooter/compare/6939ab0b6d22387fcede92d152cc3cd5c6a0d151...d4a450cd5bf91602d585202c88163315c8d976e0) --- updated-dependencies: - dependency-name: mods/pvp/shooter dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mods/pvp/shooter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/pvp/shooter b/mods/pvp/shooter index 6939ab0..d4a450c 160000 --- a/mods/pvp/shooter +++ b/mods/pvp/shooter @@ -1 +1 @@ -Subproject commit 6939ab0b6d22387fcede92d152cc3cd5c6a0d151 +Subproject commit d4a450cd5bf91602d585202c88163315c8d976e0 From b3ea22dad141a71673abd6e6e1eefe3ce425ffef Mon Sep 17 00:00:00 2001 From: philipmi Date: Wed, 21 Jul 2021 22:17:19 +0200 Subject: [PATCH 6/6] Update shooter submodule --- mods/pvp/shooter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/pvp/shooter b/mods/pvp/shooter index 5b11d11..4733f7e 160000 --- a/mods/pvp/shooter +++ b/mods/pvp/shooter @@ -1 +1 @@ -Subproject commit 5b11d11ca7a837164589a026eb54e8693c4d31c0 +Subproject commit 4733f7e6c792477a702aa172bed34df68e0c8e79