Commit graph

464 commits

Author SHA1 Message Date
95a6b0dd48 Attempt to fix crash 2022-11-28 19:40:57 +01:00
philipmi
41ff3a0a8d Update maps submodule 2022-09-22 15:50:13 +02:00
philipmi
e17faefa86 Preparation for a new class 2022-09-19 14:27:03 +02:00
philipmi
ea20089d4c Correct previous commit 2022-07-02 19:00:46 +02:00
philipmi
19c897cc98 Change rocket mechanics 2022-07-01 23:24:57 +02:00
philipmi
56f99fb271 Update maps submodule 2022-05-27 14:28:12 +02:00
philipmi
4304397a01 Pros should move items to the main chest section by default 2022-04-30 16:16:28 +02:00
philipmi
9ddc0e7b7a Add Discord link 2022-04-30 16:06:32 +02:00
philipmi
f0bbb9c7d1 Adjustments for discordmt 2022-02-12 14:46:08 +01:00
philipmi
64806a32d7 Modify leave message 2022-02-04 16:37:45 +01:00
philipmi
c84caa7198 Add git link to inventory 2022-01-07 15:32:44 +01:00
philipmi
3bfb6157ec Update maps submodule 2022-01-06 21:13:26 +01:00
philipmi
4687fb78b1 Add Gold ore to maps 2022-01-06 20:56:54 +01:00
philipmi
e9a17c53ff Add links to CTF Matrix Rooms to inventory 2022-01-06 19:57:08 +01:00
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
philipmi
fce3b46407 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mods/ctf/ctf_map/ctf_map_core/maps
2021-09-25 21:58:09 +02:00
philipmi
088f829c68 Update maps submodule 2021-09-25 21:54:09 +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
philipmi
6ae12a6017 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
 Conflicts:
	mods/pvp/shooter
2021-07-21 22:06:42 +02:00
Toby1710
b255cb3fbc
Fix vote not clearing on new match (#908) 2021-07-18 09:24:45 -07:00
philipmi
b76b3cdf65 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-07-14 22:20:07 +02:00
ksandr
24c267c3b8
Colorize leave messages (#909)
* add leave message

* Update mods/ctf/ctf_leave_message/init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update mods/ctf/ctf_leave_message/init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update mods/ctf/ctf_leave_message/mod.conf

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update mods/ctf/ctf_leave_message/init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update mods/ctf/ctf_leave_message/init.lua

okay.

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update mods/ctf/ctf_leave_message/init.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>

Co-authored-by: David Leal <halfpacho@gmail.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-07-05 13:54:47 -07:00
_Lucy
3736223110
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 <lonewolf04361@gmail.com>
2021-06-24 13:49:14 -07:00
dependabot[bot]
0e3a5413ce
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](fa7fa3e8f8...6afcf12e1c)

---
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-06-23 21:03:26 -07:00
philipmi
b05cad5633 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
 Conflicts:
	mods/other/random_messages/init.lua
2021-06-23 16:06:50 +02:00
savilli
cd6c8e74f3
Fix bug in map selection (#902) 2021-06-20 16:33:02 -07:00
Lars Müller
8c944a57af
Paxel: Ignore vertical distance, lower dist limit (#883)
* Paxel: Ignore vertical distance, lower dist. limit

* Update medic.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-06-19 15:07:26 -07:00
philipmi
96d2be9ebd Add /makecapturepro command 2021-05-27 12:53:09 +02:00
philipmi
9712c7999c Update ctf_inventory 2021-05-27 12:51:20 +02:00
philipmi
19ab4c4a70 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-27 12:46:38 +02:00
philipmi
57e02f7bb8 Make match summary formspec wider 2021-05-26 22:16:37 +02:00
philipmi
e8bcf8fe14 Reset pro requirements to original, but with second option 2021-05-26 22:13:10 +02:00
savilli
038dd3c1e5
Fix various ctf_respawn_delay bugs (#889) 2021-05-26 07:19:29 -07:00
-sniper-
e2f2ba9fae
Map maker changes by gameit (#887)
* add modified README file

* add gui.png

* revert some changes
2021-05-26 07:19:14 -07:00
philipmi
28ce8e6c63 Merge branch 'olliy1or-patch-1' of https://github.com/olliy1or/capturetheflag
 Conflicts:
	mods/ctf/ctf_classes/classes.lua
2021-05-24 22:06:21 +02:00
philipmi
1419e63743 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
 Conflicts:
	mods/ctf/ctf_classes/classes.lua
2021-05-24 15:29:15 +02:00
Axaxax88
aa37d0375d
Minor changes in classes.lua (#884)
I changed the descriptions of some classes and removed bronze tools from medic crafting whitelist.
2021-05-17 08:06:26 -07:00
_Lucy
55ab1b46e1
Increase paxel digging limit (#881)
Increase paxel digging limit to 50

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-05-15 08:16:28 -07:00
philipmi
a993113194 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-12 16:07:14 +02:00
savilli
c642f49d1a
Fix ctf_respawn_delay bug (#880) 2021-05-08 16:40:17 -07:00
savilli
69d5c40c73
Add sword group to sword damage_groups (#879)
* Add sword marker to damage_groups

* Update init.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-05-08 08:49:53 -07:00
philipmi
fd79c14b85 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-07 21:20:30 +02:00
savilli
0f5f921c0d
Fix ctf_marker crash (#877) 2021-05-04 13:59:33 -07:00
LoneWolfHT
6700266ff6
Add debug to help catch ctf_marker crash 2021-05-03 17:40:03 -07:00
LoneWolfHT
c2e7543ff3 Fix /me not showing to IRC properly 2021-05-02 22:24:29 -07:00
olliy
3279f45c6c
Update mods/ctf/ctf_classes/ranged.lua
Co-authored-by: David Leal <halfpacho@gmail.com>
2021-04-30 22:08:03 +05:00