philipmi
62e0fe449e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-15 09:47:38 +01:00
sodomite
3bb4dddc21
Add indestructible papyrus ( #776 )
...
* Add indestructible papyrus
* Update nodes.lua
* Update nodes.lua
* Update nodes.lua
* Update nodes.lua
2021-03-12 10:10:39 -08:00
-sniper-
723301dd12
Sword marker: Decrease cooldowns, fix trivial bug ( #826 )
...
* Improve sword markers
* Fix timer
* checks every 2 seconds
* Edit string sent to chat
* Clean up and increase sword special cooldown
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-12 09:02:30 -08:00
Xenon
6fb0510b73
Add hud_events mod ( #825 )
...
* Add hud_events
Reuses the HUD API provided by hud_scores
* Fix luacheck
2021-03-12 08:29:46 -08:00
philipmi
efbe6dc7b4
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-10 16:29:13 +01:00
Xenon
30e9ac02fb
Add /mr command ( #824 )
...
* Add /mr command
Add option to remove your placed marker
* Change marker message
2021-03-09 20:53:11 -08:00
philipmi
5d956ffac3
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-08 17:30:36 +01:00
dependabot-preview[bot]
0eb6071733
Update Maps Submodule ( #823 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `c6fd7be` to `eb88118`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](c6fd7bedd4...eb881181cc
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-08 07:21:43 -08:00
Minetest-j45
5409f33f24
Remove combat HUDs at start of new match ( #822 )
...
* Remove coward HUD on new game
* Update init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-07 11:09:36 -08:00
philipmi
90a5f37496
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/chest.lua
mods/other/random_messages/init.lua
2021-02-25 21:10:28 +01:00
LoneWolfHT
da3d7487f6
Update mods talking about pro requirements, add Discord link in Help tab ( #813 )
...
* Update mods talking about pro requirements
* Update chest.lua
* Update chest.lua
* Update init.lua
2021-02-25 09:29:53 -08:00
philipmi
a189946d82
Fix /makepro
2021-02-25 17:48:15 +01:00
philipmi
9de5000fb8
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/chest.lua
mods/ctf/ctf_stats/init.lua
2021-02-25 17:34:31 +01:00
LoneWolfHT
9e20609ed6
Fix /makepro not handling captures
2021-02-25 06:42:13 -08:00
Toby1710
0282bce349
Change grapple hook warning message ( #808 )
...
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
2021-02-25 06:27:49 -08:00
MinetestSam
e9487c6bde
Consider captures as a requirement for pro players ( #541 )
...
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-24 08:53:07 -08:00
philipmi
c0abdb245b
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-24 14:15:43 +01:00
dependabot-preview[bot]
216aa1d856
Update Maps Submodule ( #807 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `877ad69` to `c6fd7be`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](877ad69027...c6fd7bedd4
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-22 08:09:48 -08:00
philipmi
55f833c68b
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-21 18:21:41 +01:00
Toby1710
c56c4a9de2
Add message when player can't heal another player ( #805 )
...
* Add message when player can't heal
* Edit message
2021-02-20 18:52:13 -08:00
rubenwardy
d717547d41
Add class choice metrics
2021-02-20 21:10:25 +00:00
Apelta
fe53e06966
Remove antisabotage in favor of human moderation ( #806 )
...
* Purge antisabotage for active moderation
Not needed with more active moderation (guardians, moderator increases as of recent)
* Fix luacheck
2021-02-20 11:31:34 -08:00
philipmi
4a2d298828
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-20 11:27:01 +01:00
rubenwardy
939b2d1c5b
Remove accidental debug assert in ctf_metrics
2021-02-19 22:42:11 +00:00
rubenwardy
cca78bc62a
Rename /ctf_queue_restart to /restart
2021-02-19 22:34:10 +00:00
rubenwardy
25c9f09d6e
Update ctf_metrics
2021-02-19 22:28:34 +00:00
rubenwardy
a86bbdbe82
Add missing allowed_mapgens
key to game.conf
2021-02-19 22:25:09 +00:00
rubenwardy
1e80291664
Add log level to avoid logs being printed to chat
2021-02-19 22:24:57 +00:00
philipmi
011fc7f573
Make a Capture Rate of 33% and 10 captures a requirement for pro players
2021-02-19 18:12:25 +01:00
philipmi
380a252c7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-19 13:23:29 +01:00
Toby1710
5bdb99d184
Change class item warning ( #802 )
2021-02-17 14:01:25 -08:00
philipmi
772cf49209
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-17 12:47:37 +01:00
Avyukt More
b15e09e763
Add Savanna Dirt and Savanna Dirt with Savanna Grass ( #800 )
...
* Add Savanna Dirt
* Add textures for Savanna grass
* Update mods/mtg/default/nodes.lua
* Debugging
2021-02-16 06:14:14 -08:00
philipmi
d0e00944ca
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 18:05:29 +01:00
dependabot-preview[bot]
b630dacfb9
Update Maps Submodule ( #798 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `b7b2f83` to `877ad69`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](b7b2f83388...877ad69027
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-15 08:01:53 -08:00
philipmi
faf74cbcb0
Improve shooter_rocket
2021-02-15 14:11:08 +01:00
philipmi
14159a953c
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 14:03:10 +01:00
Avyukt More
66784b72af
Map Maker Improvements ( #757 )
...
* Updating Changes
* Giving an Example of initial_stuff
* Unification
* Improving English
* Better English
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Adding Pistol example for initia_stuff
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Update
* Update gui.lua
* Update gui.lua
* Update README.md
* Better English
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Optional Data
* Each Word Matters
* Update gui.lua
* Update gui.lua
* Map.mts instead of only .mts
* www.humus.name suggestion for skybox images
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Update README.md
* "choose" instead of "chooze"
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* small sentence
* Adding missing word "is"
* "the" instead of "The"
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* removing useless sentences
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
2021-02-14 20:53:41 -08:00
philipmi
7157751405
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 22:06:32 +01:00
LoneWolfHT
87bd607856
Fix combat not ending on death
2021-02-14 11:17:17 -08:00
philipmi
f3d0067d8c
Update shooter submodule
2021-02-14 12:21:17 +01:00
philipmi
7f75da82ff
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 11:32:58 +01:00
savilli
abf1fa2ad5
Don't count kill assist on build time or player immunity ( #795 )
...
* Don't count kill assist on build time or player immunity
* Remove register_can_attack, use can_attack global func
2021-02-13 14:17:05 -08:00
philipmi
ca8cde8a0a
Add "Capture Rate" statistic
2021-02-13 20:53:29 +01:00
philipmi
7c0283df64
Merge remote-tracking branch 'upstream/master'
2021-02-13 20:40:42 +01:00
LoneWolfHT
3e95d92359
Make SMG semi-auto with more damage
2021-02-11 14:01:10 -08:00
dependabot-preview[bot]
3a63361814
Change SMG to burst fire ( #796 )
...
Bumps [mods/pvp/shooter](https://github.com/MT-CTF/shooter ) from `e856150` to `394d915`.
- [Release notes](https://github.com/MT-CTF/shooter/releases )
- [Commits](e856150c13...394d9154d3
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-11 13:42:18 -08:00
philipmi
5a9558ca7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 17:09:18 +01:00
dependabot-preview[bot]
8b3e694b56
Update maps submodule ( #792 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `ad7dad2` to `b7b2f83`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](ad7dad2eea...b7b2f83388
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-11 06:21:24 -08:00
philipmi
65118f5e72
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 11:26:54 +01:00