minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: minetest:fce3b46407aed0b966f9149d76da4a38ab280128
Branches Tags
minetest:master
..
compare: minetest:73bdf9b28a5b6725ecb2ca8064cf28ad71557cdf
Branches Tags
minetest:master

7 commits
fce3b46407 ... 73bdf9b28a

Author SHA1 Message Date
philipmi
73bdf9b28a Update maps submodule 2021-10-02 14:02:59 +02:00
philipmi
fef2d8ca0a Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 
 Conflicts:
	mods/ctf/ctf_map/ctf_map_core/maps
 2021-09-25 22:24:53 +02:00
dependabot[bot]
0574a435a9
Update maps submodule 
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `6afcf12` to `5915ff6`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](6afcf12e1c...5915ff6280)

---
updated-dependencies:
- dependency-name: mods/ctf/ctf_map/ctf_map_core/maps
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-18 11:17:02 -06:00
LoneWolfHT
ea9d9ad2d8
Revert "Rework melee damage (#878)" (#925) 
This reverts commit 84dc7da461.
 2021-09-03 16:20:18 -07:00
savilli
84dc7da461
Rework melee damage (#878) 2021-09-03 07:22:20 -07:00
LoneWolfHT
f06eca30f0
Make worldedit an optional dependency of map_maker 2021-08-30 08:20:09 -07:00
AFCMS
1512784d81
MTG: Optionally use 9 sliced background (#924) 2021-08-29 09:06:18 -07:00
3 changed files with 19 additions and 6 deletions
Show stats Expand all files Collapse all files

2
mods/ctf/ctf_map/ctf_map_core/maps

@ -1 +1 @@
Subproject commit 10970201c9961fc34158b68dd14ff1e073e1124e Subproject commit 30c292d51e6a289c2f33bb5f0ad9f3774289a018

3
mods/ctf/ctf_map/map_maker/mod.conf
View file

@ -1,2 +1,3 @@
name = map_maker name = map_maker
depends = ctf_map_core, worldedit depends = ctf_map_core
optional_depends = worldedit

18
mods/mtg/default/init.lua
View file

@ -10,10 +10,22 @@ default.LIGHT_MAX = 14
-- GUI related stuff -- GUI related stuff
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
player:set_formspec_prepend([[ -- Set formspec prepend
local formspec = [[
bgcolor[#080808BB;true] bgcolor[#080808BB;true]
background[5,5;1,1;gui_formbg.png;true] listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]
listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]]) ]]
local name = player:get_player_name()
local info = minetest.get_player_information(name)
if info.formspec_version > 1 then
formspec = formspec .. "background9[5,5;1,1;gui_formbg.png;true;10]"
else
formspec = formspec .. "background[5,5;1,1;gui_formbg.png;true]"
end
player:set_formspec_prepend(formspec)
end) end)
function default.get_hotbar_bg(x,y) function default.get_hotbar_bg(x,y)