Commit graph

1115 commits

Author SHA1 Message Date
savilli 0df01b9308
Fix double map skipping (#866) 2021-04-16 09:24:24 -07:00
philipmi e23dbb3d80 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-07 21:40:56 +02:00
Lars Müller 5eb02e32e4
Indestructible map nodes: Fix wool aliases (#859) 2021-04-07 10:33:19 -07:00
philipmi c1b3604a97 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-07 16:58:38 +02:00
LoneWolfHT 6be1373cae Revert "Create indestructible nodes after all mods load"
This reverts commit 8b1de22854.
2021-04-06 21:37:44 -07:00
LoneWolfHT 6cf958800b Update maps submodule 2021-04-06 21:35:44 -07:00
LoneWolfHT 8b1de22854
Create indestructible nodes after all mods load 2021-04-06 21:21:42 -07:00
savilli 665ec17c69
Fix suicider color in kill event on the hud (#857) 2021-04-06 08:48:48 -07:00
Lars Müller 2be9adb890
Fix cleanup (#856)
* Map nodes: Readd wool aliases

* Fix undefined behavior

* Merge branch 'fix-immortal-fences' into fix-cleanup

* Set buildable_to to false for immortal nodes
2021-04-06 08:07:58 -07:00
Lars Müller f965b310fd
Map nodes: Readd wool aliases (#855) 2021-04-06 07:14:36 -07:00
LoneWolfHT f774ecff0f
Kill the trailing whitespace 2021-04-05 08:24:00 -07:00
Lars Müller 4d680e6b6c
Code duplication cleanup (#827)
* Code duplication cleanup

* Fix torches, no immortal variants for some nodes
2021-04-05 08:22:24 -07:00
Lars Müller 433509bcdd
Announce bounties only to the enemy team (#849) 2021-04-05 07:41:51 -07:00
LoneWolfHT c0f224a5bc
Medic paxel improvements 2021-04-04 09:06:40 -07:00
Lars Müller c5560f7a2d
Use huds with more player notifications (#853) 2021-04-01 10:17:17 -07:00
LoneWolfHT bc519e605a
Fix crash when no paxel stop reason is given 2021-04-01 09:52:13 -07:00
savilli 054e1389c4
Make your last hitter get a kill if you suicide any possible way (#840) 2021-04-01 08:33:07 -07:00
olliy 1225504258
Merge pull request #1 from MT-CTF/master
update
2021-04-01 15:00:47 +05:00
philipmi cd355bc9cd Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-31 18:36:17 +02:00
Lars Müller 87f7212f43
Replace chat with HUD events, add BS 5 palette (#848)
* Replace chat with HUD events, add BS 5 palette

* Use HUD events for paxel too

* Move paxel_stop function up
2021-03-29 14:00:46 -07:00
philipmi 16c31aa273 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-29 15:04:23 +02:00
Lars Müller e40d1e666a
place_limit: Use HUD notifications & quota instead of time between placements (#844)
* place_limit: Use HUD notifications

* Adjust warning color

* Quota instead of time between placements

* Bump maps submodule
2021-03-28 12:45:49 -07:00
Lars Müller fd5b8a484e
Fix doors disappearing when placed (#843) 2021-03-27 11:01:40 -07:00
Lars Müller 7382db367b
Limit node placement to 5 NPS (#803)
* Limit placement to 5 nodes per second

* Add Readme, check pointed thing, inform player

* Include team door fix

* Add license
2021-03-27 07:27:22 -07:00
savilli 243061957a
Postpone map skipping until flag holder captures or loses the flag (#835)
* Postpone map skipping until flag holder captures or loses the flag

* Wait 5s after flag drop
2021-03-24 07:34:02 -07:00
philipmi ed65ddb6d0 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
 Conflicts:
	mods/other/random_messages/init.lua
2021-03-22 11:25:11 +01:00
LoneWolfHT 1568de3449
Fix crash 2021-03-19 08:31:52 -07:00
dependabot-preview[bot] 9e844d8d71
Update Maps Submodule (#836)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `eb88118` to `bbf6007`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](eb881181cc...bbf6007785)

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-19 08:30:47 -07:00
LoneWolfHT 96147c7b97
Log /me command when used and fix bug 2021-03-18 19:03:07 -07:00
LoneWolfHT ebd332a3c6
Appease luacheck 2021-03-18 17:48:21 -07:00
LoneWolfHT e9f09c3587
Send /me output to IRC 2021-03-18 17:45:11 -07:00
_Lucy 92104db90f
Update random_messages (#833)
* Update init.lua

* Update init.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-17 08:34:32 -07:00
WINNIE 05fdcaa31e
Lower Paxel Cooldown (#832) 2021-03-17 08:26:58 -07:00
LoneWolfHT 36a6f4117a
Fix crash fix not fixing crash 2021-03-16 16:41:34 -07:00
philipmi 327504b131 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-16 20:15:20 +01:00
David Leal 1ef6ddadfd
Fix changing to the same class being treated as a change to a different class (#829)
* Fix running cooldown when changing...

...to the same class.

* Implement savilli's suggestion

Co-authored-by: savilli <savilli@users.noreply.github.com>

* Move return and remove unneeded check

* Completely remove an if check as now unneeded

* Remove whitespace from empty line

Co-authored-by: savilli <savilli@users.noreply.github.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-15 20:08:01 -07:00
LoneWolfHT 844436ca3d
Fix crash with shooter_hook 2021-03-15 08:30:54 -07:00
LoneWolfHT 0ed4cadb7c
Add missing priv check to /join cmd 2021-03-15 08:25:14 -07:00
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