Commit Graph

6512 Commits

Author SHA1 Message Date
Elias Fleckenstein
79aac4c494 Merge pull request 'Rewrite armor + new damage system' (#1555) from damage into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1555
2021-04-27 16:32:41 +00:00
Elias Fleckenstein
a41aace9d7 Merge branch 'master' into damage 2021-04-27 18:33:35 +02:00
epCode
9f015f2c58 Make the slime anims/texutres Much better 2021-04-26 17:45:28 -07:00
AFCMS
72e53a82d7 Basic not working script 2021-04-26 19:16:27 +02:00
Elias Fleckenstein
0867d6e406 Update german mcl_banners translations 2021-04-26 11:15:36 +02:00
Elias Fleckenstein
347cc7ee7c Update mcl_banner translations to new template 2021-04-26 11:13:36 +02:00
Elias Fleckenstein
6dc6fc8ec3 Update mcl_flowerpots translations to new template 2021-04-26 11:05:27 +02:00
Elias Fleckenstein
b43f59332a Update mcl_enchanting translations to new template 2021-04-26 11:03:53 +02:00
Elias Fleckenstein
3b1d71382f Update es, fr and ru cauldron translations to use the new template 2021-04-26 11:01:52 +02:00
Elias Fleckenstein
05be20fcb8 Update mcl_enchanting translations 2021-04-26 11:00:53 +02:00
Elias Fleckenstein
5df1df8e21 Update cauldron code to use the corrected translation template string 2021-04-26 10:52:50 +02:00
Elias Fleckenstein
fed4596cb4 Update german cauldron translation fully 2021-04-26 10:52:07 +02:00
Elias Fleckenstein
a77a916cc2 Update cauldron translations 2021-04-26 10:50:23 +02:00
Elias Fleckenstein
8a59d7b9c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-26 10:36:42 +02:00
Elias Fleckenstein
f6d34db76e Update german Minecart translation 2021-04-26 10:36:22 +02:00
NO11
8df9fe76d8 Add german translation for stripped wood 2021-04-26 08:23:26 +00:00
Elias Fleckenstein
a2983e1fda Update boats translation 2021-04-26 10:17:07 +02:00
Elias Fleckenstein
e710795eed Merge branch 'master' into damage 2021-04-26 10:06:09 +02:00
NO11
4d2210c4e5 Fix german translation mistake 2021-04-26 08:03:20 +00:00
NO11
749f1a4a62 Fix wrong template, sry 2021-04-26 07:50:25 +00:00
NO11
e5a44dcb75 Add template for fireworks translation 2021-04-26 07:45:26 +00:00
Elias Fleckenstein
dd68b79782 Merge branch 'master' into damage 2021-04-26 09:29:03 +02:00
epCode
aac9d6a105 impliment crash damage for elytra 2021-04-25 15:49:15 -07:00
NO11
dada1e9815 Add template for stripped wood translation 2021-04-25 21:47:12 +00:00
jordan4ibanez
8a78b1f8ef Update my name 2021-04-25 20:27:50 +00:00
Elias Fleckenstein
edc89898bb Integrate fire resistance 2021-04-25 20:51:13 +02:00
Elias Fleckenstein
fede04eaa6 Make armor listring work 2021-04-25 20:20:26 +02:00
Elias Fleckenstein
57662b319c Merge branch 'master' into damage 2021-04-25 20:04:15 +02:00
Elias Fleckenstein
3e3f53efbd New attempt to fix #1392 2021-04-25 19:59:08 +02:00
Elias Fleckenstein
97e69e04aa Implement assist death messages 2021-04-25 17:49:27 +02:00
Elias Fleckenstein
cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +02:00
Elias Fleckenstein
b2407e407a Add mob descriptions 2021-04-25 17:30:15 +02:00
Elias Fleckenstein
aeaec68c1b Update german translations for mcl_death_messages 2021-04-25 17:11:47 +02:00
Elias Fleckenstein
302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
AFCMS
228759e49b Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-25 14:37:17 +02:00
Elias Fleckenstein
6aecae6eea Simplify damage pipeline; Add on_death and on_damage callbacks 2021-04-25 13:50:07 +02:00
Elias Fleckenstein
939229cb21 Fix on_equip crash 2021-04-25 13:29:22 +02:00
Elias Fleckenstein
58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
Elias Fleckenstein
ddb7e8388a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-25 13:09:27 +02:00
Elias Fleckenstein
9eba2add3f Rewrite burning API 2021-04-25 13:09:20 +02:00
NO11
642351a1d2 Add #1553 fireworks rocket now makes particles when used for flying 2021-04-24 19:35:23 +00:00
Elias Åström
73cd482e55 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 16:30:56 +02:00
AFCMS
414adff8fb Fix bad API documentation od mcl_death_drop 2021-04-23 13:59:37 +00:00
Elias Åström
7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Elias Fleckenstein
a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Elias Fleckenstein
62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Elias Fleckenstein
a836ac9879 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 13:42:47 +02:00
Elias Fleckenstein
827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Elias Fleckenstein
78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Elias Fleckenstein
50b6f03977 Integrate no fall damage in water & end portal 2021-04-23 12:34:24 +02:00