Commit graph

183 commits

Author SHA1 Message Date
philipmi
41ff3a0a8d Update maps submodule 2022-09-22 15:50:13 +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
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
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
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
f06eca30f0
Make worldedit an optional dependency of map_maker 2021-08-30 08:20:09 -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
philipmi
19ab4c4a70 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-27 12:46:38 +02:00
philipmi
e8bcf8fe14 Reset pro requirements to original, but with second option 2021-05-26 22:13:10 +02: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
fd79c14b85 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-07 21:20:30 +02: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
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
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
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
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
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
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
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
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
MinetestSam
e9487c6bde
Consider captures as a requirement for pro players (#541)
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-24 08:53:07 -08:00
philipmi
c0abdb245b Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-02-24 14:15:43 +01:00
dependabot-preview[bot]
216aa1d856
Update Maps Submodule (#807)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `877ad69` to `c6fd7be`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](877ad69027...c6fd7bedd4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-22 08:09:48 -08:00
philipmi
011fc7f573 Make a Capture Rate of 33% and 10 captures a requirement for pro players 2021-02-19 18:12:25 +01:00
dependabot-preview[bot]
b630dacfb9
Update Maps Submodule (#798)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `b7b2f83` to `877ad69`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](b7b2f83388...877ad69027)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-15 08:01:53 -08:00
Avyukt More
66784b72af
Map Maker Improvements (#757)
* Updating Changes

* Giving an Example of initial_stuff

* Unification

* Improving English

* Better English

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* Adding Pistol example for initia_stuff

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* Update

* Update gui.lua

* Update gui.lua

* Update README.md

* Better English

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* Optional Data

* Each Word Matters

* Update gui.lua

* Update gui.lua

* Map.mts instead of only .mts

* www.humus.name suggestion for skybox images

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* Update README.md

* "choose" instead of "chooze"

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* small sentence

* Adding missing word "is"

* "the" instead of "The"

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

* removing useless sentences

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>

Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
2021-02-14 20:53:41 -08:00
dependabot-preview[bot]
8b3e694b56
Update maps submodule (#792)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `ad7dad2` to `b7b2f83`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](ad7dad2eea...b7b2f83388)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-11 06:21:24 -08:00
dependabot-preview[bot]
f786784ba8
Update Maps Submodule (#787)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `2b22d20` to `ad7dad2`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](2b22d20362...ad7dad2eea)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-09 07:51:01 -08:00
dependabot-preview[bot]
c9c2f6c7e0
Update Maps submodule (#786)
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `08f5719` to `2b22d20`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](08f571991b...2b22d20362)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-08 08:37:36 -08:00
dependabot-preview[bot]
8315d0074a
Bump mods/ctf/ctf_map/ctf_map_core/maps from e8dffc7 to 08f5719 (#780) 2021-02-05 13:58:35 +00:00
dependabot-preview[bot]
87d9057278
Bump mods/ctf/ctf_map/ctf_map_core/maps from 9dd765d to e8dffc7 (#778) 2021-02-02 14:32:07 +00:00
-sniper-
6515f1e189
Improve initial team chest items (#770) 2021-01-31 08:33:57 -08:00
dependabot-preview[bot]
e09ed4d0ea
Bump mods/ctf/ctf_map/ctf_map_core/maps from bbbe390 to 9dd765d (#765) 2021-01-28 15:26:57 +00:00
dependabot-preview[bot]
0c9cd8ea2e
Bump mods/ctf/ctf_map/ctf_map_core/maps from a643b6c to bbbe390 (#743) 2021-01-08 15:33:07 +00:00