Commit graph

436 commits

Author SHA1 Message Date
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
olliy
b2ea5c6c8a
Update classes.lua 2021-04-30 01:20:51 +05:00
olliy
bdfc9d5ecd
Update ranged.lua 2021-04-30 01:17:13 +05:00
dependabot[bot]
4ba30a98aa
Bump mods/ctf/ctf_map/ctf_map_core/maps from 5fe0d7b to fa7fa3e (#873) 2021-04-29 19:27:22 +00:00
savilli
47cc8928f7
Increase the distance between the same map on maps shuffling (#869) 2021-04-29 06:49:58 -07:00
_Lucy
2cfbd9b4c4
Make cobble stairs craftable (#860)
* Update init.lua

* Update init.lua
2021-04-28 07:20:21 -07:00
philipmi
67214a79ab Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-24 21:33:30 +02:00
Toby1710
7733c2cb67
Prevent empty messages in team chat (#830)
* Update init.lua

* Update init.lua

* Update init.lua

* Update mods/ctf/ctf_chat/init.lua

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

* Update init.lua

* Update mods/ctf/ctf_chat/init.lua

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

* Update init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>
2021-04-21 08:46:56 -07:00
Lars Müller
c8612a69e4
Fix bounties being shown to the same team on join (#865)
* Fix bounties being shown to the same team on join

* Fix submodules
2021-04-16 10:09:16 -07:00
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
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
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