Commit graph

1115 commits

Author SHA1 Message Date
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
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
philipmi b117cf0ea9 Remove .github/ 2021-05-25 17:06:28 +02: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 b0b4052408 Update shooter submodule 2021-05-24 21:51:59 +02:00
philipmi 816b407042 Add hudbars mod 2021-05-24 15:49:17 +02:00
philipmi 632aa7bae6 Remove real_suffocation mod 2021-05-24 15:38:41 +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 4b9298c530 Reduce place limit to 4 NPS 2021-05-07 21:33:52 +02: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 6d5f046d41
Fix texurepacks being able to hide grenade smoke (#876)
* Fix texurepacks being able to hide grenade smoke

* Update smoke texture
2021-05-04 10:05:14 -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 d778b3a622
Delete mods/other/disallowed_names directory 2021-04-30 01:23:37 +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
olliy 9c1339f6d7
Merge pull request #3 from MT-CTF/master
update
2021-04-30 01:01:20 +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
dependabot-preview[bot] f824b86142
Upgrade to GitHub-native Dependabot (#872)
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-29 12:25:55 -07:00
Lars Müller 4f49560569
Medkits: Don't give back if map is skipped (#870) 2021-04-29 06:54:29 -07: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
olliy a9806b593e
Merge pull request #2 from MT-CTF/master
update
2021-04-20 19:24:20 +05: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