Commit graph

438 commits

Author SHA1 Message Date
kay27
56a82d5a82 Merge remote-tracking branch 'origin/master' into mineclone5 2021-07-13 01:00:03 +04:00
epCode
960b653979 fix #1299 2021-07-12 11:50:37 -07:00
kay27
35f07a8b66 [mineclone5] Put mob flow code at its right place, fix unloaded player spawn rechech 2021-06-25 03:53:58 +04:00
kay27
f30a2ab6bc Merge remote-tracking branch 'origin/master' into mineclone5 2021-06-21 02:42:19 +04:00
NO11
eafb1a2797 Use add_particle instead of minetest.add_particlespawner for elytra rocket particles 2021-06-12 17:23:03 +00:00
kay27
b3e3b91b7c Merge master 2021-06-12 15:12:33 +04:00
marcin-serwin
cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS
cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
NO11
0d619ec6a8 Make vine protect from fall damage 2021-05-28 17:26:00 +00:00
Marcin Serwin
dcceafad41 Add polish translation of mcl_hunger 2021-05-25 21:55:16 +02:00
Marcin Serwin
f421e07d1c Add polish translation of mcl_spawn 2021-05-25 21:51:50 +02:00
AFCMS
9e074af07f unify code style [1] 2021-05-25 12:52:25 +02:00
AFCMS
388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS
84a800f22b fix many warnings 2021-05-22 19:58:09 +02:00
NO11
cb82e3c9c5 Make a cobweb protect from fall damage 2021-05-16 21:13:07 +00:00
Code-Sploit
ba333d016a Merge pull request 'master' (#1736) from master into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1736
2021-05-13 11:57:33 +00:00
jordan4ibanez
ad4e86deca Fix #1726 2021-05-10 20:17:43 -04:00
kay27
f53f961122 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:09:32 +04:00
Elias Fleckenstein
a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Elias Fleckenstein
f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Elias Fleckenstein
1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Marcin Serwin
397a05b651 Add polish translation of mcl_skins 2021-04-29 17:16:30 +02:00
Marcin Serwin
0e8c002665 Add polish translation of mcl_playerplus 2021-04-29 16:56:33 +02:00
Elias Fleckenstein
cca03bcbd2 Merge branch 'master' into mineclone5 2021-04-28 11:40:21 +02:00
Elias Fleckenstein
819d59dbe7 Use fly_into_wall damage type for elytra damage 2021-04-27 20:56:53 +02:00
Elias Fleckenstein
6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Elias Fleckenstein
91211ac1f7 Merge branch 'master' into mineclone5 2021-04-26 10:08:08 +02:00
Elias Fleckenstein
dd68b79782 Merge branch 'master' into damage 2021-04-26 09:29:03 +02:00
jordan4ibanez
f57c4709ac Comment out code that causes mobs to glitch push players in mcl_playerplus 2021-04-25 19:54:11 -04:00
epCode
aac9d6a105 impliment crash damage for elytra 2021-04-25 15:49:15 -07:00
Elias Fleckenstein
cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +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
58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
NO11
642351a1d2 Add #1553 fireworks rocket now makes particles when used for flying 2021-04-24 19:35:23 +00:00
AFCMS
414adff8fb Fix bad API documentation od mcl_death_drop 2021-04-23 13:59:37 +00:00
Elias Fleckenstein
62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Elias Fleckenstein
50b6f03977 Integrate no fall damage in water & end portal 2021-04-23 12:34:24 +02:00
Sven792
038066f0c5 Mirrored foodbar icons to fit the right-to-left change 2021-04-23 09:52:09 +02:00
Elias Fleckenstein
1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias Fleckenstein
fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
epCode
9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Elias Fleckenstein
ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
Elias Fleckenstein
7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
2021-04-19 15:16:59 +02:00
Elias Fleckenstein
d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02:00
Elias Fleckenstein
d08a226a51 Integrate critical hits 2021-04-18 19:50:48 +02:00
Elias Fleckenstein
2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Elias Fleckenstein
f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
Elias Fleckenstein
5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +02:00
AFCMS
f967aa3d51 remove unuseful code 2021-04-18 00:10:11 +02:00