philipmi
d0e00944ca
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 18:05:29 +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
philipmi
faf74cbcb0
Improve shooter_rocket
2021-02-15 14:11:08 +01:00
philipmi
14159a953c
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 14:03:10 +01: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
philipmi
7157751405
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 22:06:32 +01:00
LoneWolfHT
87bd607856
Fix combat not ending on death
2021-02-14 11:17:17 -08:00
philipmi
f3d0067d8c
Update shooter submodule
2021-02-14 12:21:17 +01:00
philipmi
7f75da82ff
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 11:32:58 +01:00
savilli
abf1fa2ad5
Don't count kill assist on build time or player immunity ( #795 )
...
* Don't count kill assist on build time or player immunity
* Remove register_can_attack, use can_attack global func
2021-02-13 14:17:05 -08:00
philipmi
ca8cde8a0a
Add "Capture Rate" statistic
2021-02-13 20:53:29 +01:00
philipmi
7c0283df64
Merge remote-tracking branch 'upstream/master'
2021-02-13 20:40:42 +01:00
LoneWolfHT
3e95d92359
Make SMG semi-auto with more damage
2021-02-11 14:01:10 -08:00
dependabot-preview[bot]
3a63361814
Change SMG to burst fire ( #796 )
...
Bumps [mods/pvp/shooter](https://github.com/MT-CTF/shooter ) from `e856150` to `394d915`.
- [Release notes](https://github.com/MT-CTF/shooter/releases )
- [Commits](e856150c13...394d9154d3
)
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 13:42:18 -08:00
philipmi
5a9558ca7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 17:09:18 +01: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
philipmi
65118f5e72
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 11:26:54 +01:00
savilli
5f456a504a
Make ctf_stats award kills again ( #788 )
...
* Restore register_on_killedplayer callback in ctf_stats
* Remove unused args
Co-authored-by: savilli <savilli>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-10 21:18:09 -08:00
LoneWolfHT
6a12dcc12a
Fix kill_assist crash
2021-02-10 20:57:29 -08:00
LoneWolfHT
88e6fb7af9
Fix potential kill assist bug
2021-02-10 19:14:12 -08:00
philipmi
69b025d794
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-10 13:58:19 +01:00
LoneWolfHT
c703733e6f
Clean up kill assist code
2021-02-09 19:15:36 -08:00
LoneWolfHT
fdfad82844
Fix incorrect usage of math.min
2021-02-09 19:11:19 -08:00
LoneWolfHT
615d4369f6
Improve kill assist mod
2021-02-09 16:10:53 -08:00
philipmi
03767c1dc5
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-09 21:34:41 +01:00
LoneWolfHT
4e3844bd00
Fix kill_assist percentage
2021-02-09 12:12:39 -08:00
LoneWolfHT
17278e22a4
Reduce initial autovote delay to 50+ minutes
2021-02-09 09:42:23 -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
philipmi
63d2b14d37
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-09 08:11:16 +01:00
LoneWolfHT
eb71f5e385
Make combat log count as death
2021-02-08 16:09:53 -08:00
Anthony-De
f8cb85be9f
Fix up and re-add kill assists ( #782 )
...
* Add kill assists
* Fix bug
* Move to seperate mod
* Fix bugs and improve code some more
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-08 16:03:03 -08:00
philipmi
c988792d02
Bump mods/ctf/ctf_map/ctf_map_core/maps from e8dffc7
to 2b22d20
2021-02-08 20:28:50 +01:00
philipmi
5fa0a981c4
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/maps
2021-02-08 18:18:54 +01: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
philipmi
04c75c989d
Re-add rocketeer class
2021-02-07 21:53:20 +01:00
philipmi
81bd8ca9b2
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-07 21:18:27 +01:00
-sniper-
928476c371
Add sound when walking on wool ( #783 )
2021-02-07 07:06:08 -08:00
LoneWolfHT
510ca896cd
Revert "Add kill assists ( #755 )" ( #781 )
...
This reverts commit 49f4e6fd47
.
2021-02-05 15:46:29 -08:00
philipmi
58e3da5314
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-05 15:52:02 +01: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
philipmi
b3c65f9fc6
First fork commit
2021-02-04 20:57:23 +01:00
Avyukt More
02fa088b24
Misc crafting changes ( #773 )
...
* Crafting Changes
* Smoke Grenade Crafting Change
* using group:wood instead of default:wood
* Adding Diamonds Craftable
* Update init.lua
* Changing value of the "ctf_traps:dirt" to 5 to craft at a time
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
* Equality between ctf_traps:dirt n ctf_traps:cobble
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
2021-02-04 06:30:01 -08: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
Anthony-De
49f4e6fd47
Add kill assists ( #755 )
...
* Update teams.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua Kill assist implemented
* Update init.lua Remove unused variables
* Added ctf.clearAssists function
Only awards those who did more that 50% of damage
Clears attackers stats after suicide
* Remove unused variable
* Minor modifications
renamed ctf.clearAssists to ctf.clear_assists
changed playerName to player
* Cap assist points
* Reaching full health while in combat clears assist data
* split points between assisting players by damage done
* Reworked assist data storage to work with a table rather than player metadata
* Fix lua check
* Removed duplicate scoring
* Change kill assist color
* Health regen subtracts from assist.
Suicide gives assist points
* Fixed accessing nil value for max_hp
* Corrected max_hp
* hardcode hp list for max hp
2021-02-01 08:24:29 -08:00
-sniper-
6515f1e189
Improve initial team chest items ( #770 )
2021-01-31 08:33:57 -08:00
rubenwardy
33f507c28e
Add min_minetest_version to game.conf
2021-01-29 23:46:14 +00: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
-sniper-
1b62c12b4d
Allow steel trapdoors to be opened by players ( #764 )
...
* steel doors and trapdoors: protected = false
2021-01-28 07:20:03 -08:00
RyanZem
5e955ad4a4
Color score green in bounty messages ( #745 )
...
* Delete init.lua
* Make bounty color green "bounty_score points!"
* Delete init.lua
* Make in bounty green color (bounty_score points!)
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update mods/ctf/ctf_bounties/init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-25 10:49:13 -08:00
Toby1710
b49909fc50
Change colors for /r output ( #759 )
...
* Change stats color when type /r
Co-authored-by: David Leal <halfpacho@gmail.com>
2021-01-23 09:13:13 -08:00