Commit graph

1146 commits

Author SHA1 Message Date
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
776a0b36f5 Update latest_updates 2022-04-30 16:18:35 +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
4e20ff077d Fix crafting submodule 2022-01-06 21:04:44 +01:00
philipmi
4687fb78b1 Add Gold ore to maps 2022-01-06 20:56:54 +01:00
philipmi
6029f5555c Update crafting submodule 2022-01-06 20:06:58 +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
afd7d36a4e Update maps submodule 2021-09-25 21:55:49 +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
AFCMS
1512784d81
MTG: Optionally use 9 sliced background (#924) 2021-08-29 09:06:18 -07:00
philipmi
b3ea22dad1 Update shooter submodule 2021-07-21 22:17:19 +02: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
dependabot[bot]
e3cf542aec
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](6939ab0b6d...d4a450cd5b)

---
updated-dependencies:
- dependency-name: mods/pvp/shooter
  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-07-18 10:23:33 -07: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
73adac73c3 Nerf guns 2021-06-23 16:13:50 +02: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
_Lucy
ecd8cbb6c7
Update random messages (#894)
* Update random messages

Edits 2 messages, adds 1 message

* Update init.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-06-10 10:53:47 -07:00
David Leal
1831da8496
Reset sprint on new match (#893) 2021-06-06 06:28:03 -07:00
philipmi
d05b22e38d Adapt playerplus mod 2021-06-03 16:46:57 +02:00
philipmi
6cedcc7b84 Add playerplus mod 2021-06-03 15:19:35 +02: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
282128382d Update random_messages 2021-05-26 22:26:07 +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
Axaxax88
055be8c9e5
Make clay do not drop clay lump (#885)
* Make clay do not drop clay lump

* Update nodes.lua
2021-05-26 07:18:45 -07:00