Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,408 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

7408 Commits (210a0d8ee176954d528e9e835b3b3cc5db243acf)

Author SHA1 Message Date
cora 6493f2885b Merge pull request 'Correct bucket behavior' (#2007) from NO11/MineClone2:buckets+ into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2007
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-02-18 00:17:50 +00:00
NO11 c40c05f594 Exact MC behavior 2022-02-17 15:32:58 +00:00
NO11 8db28c1337 Update get_pointed_thing function 2022-02-17 15:30:41 +00:00
NO11 d46a96c43a Merge branch 'master' into buckets+ 2022-02-17 14:48:07 +00:00
NO11 3cfcd1355f Add missing dependency 2022-02-17 14:42:01 +00:00
NO11 4707cd4526 Correct bucket behavior 2022-02-17 14:36:48 +00:00
NO11 ad99746d99 Add get_pointed_thing function 2022-02-17 14:35:51 +00:00
cora cabf6e8cd1 Merge pull request 'Fix mob-in-boat crash in Minetest 5.5-dev' (#2000) from fix-boat-crash-2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2000
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-02-15 12:00:03 +00:00
Nils Dagsson Moskopp adf738854a
Fix mob-in-boat crash in Minetest 5.5-dev 
In Minetest 5.4.1, calling get_player_control() on a mob returned the
empty string. Minetest commit 5eb45e1ea03c6104f007efec6dd9c351f310193d
changed this, so now calling get_player_control() on a mob returns nil.

As mcl_boats defines boats that can have a player or a mob as a driver,
code like the following crashes with a changed get_player_control() API:

local ctrl = driver:get_player_control()
if ctrl.sneak then
    detach_object(driver, true)
end

Furthermore, once a world has crashed, joining it near a mob that is the
driver of a boat with such control code immediately crashes again.

When I reported this bug to Minetest, several Minetest core developers
stated that they disliked the old API and proposed other return values
for calling a mob's get_player_control() function – all different from
the empty string. Since I have some doubts that this bug will be fixed
in Minetest 5.5.0, boat code must take into account a nil return value.

Minetest issue: https://github.com/minetest/minetest/issues/11989
 2022-02-15 11:17:01 +01:00
cora 87427cb8af Merge pull request '`mcl_armor` documentation' (#1917) from AFCMS/MineClone2:armor-doc into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1917
 2022-02-13 20:49:37 +00:00
AFCMS da4952a125
wip mcl_damage documentation 2022-02-13 21:31:04 +01:00
AFCMS c59bea211d
fix some typos 2022-02-13 21:31:03 +01:00
AFCMS 5aa18d573e
document mcl_armor function (WIP) 2022-02-13 21:31:03 +01:00
AFCMS 13f8fd457c
document manual armor creation 2022-02-13 21:31:03 +01:00
AFCMS 2b820d7756
`mcl_armor.register_set()` documentation 2022-02-13 21:31:02 +01:00
cora f803a25aea Merge pull request 'Fix bug when applying another enchantment to a renamed item' (#1989) from fix-1922 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1989
 2022-02-12 20:37:48 +00:00
Elias Åström 4ca89cfcae Update groupcaps_hash function to minetest.sha1 2022-02-12 20:08:03 +01:00
Elias Åström a6c5c8a72a Call update_groupcaps from load_enchantments 
This avoids the need to call the function from on_enchant for unbreaking
and efficiency.
 2022-02-12 19:43:01 +01:00
Elias Åström d898b02c8b Fix #1922 2022-02-12 19:43:01 +01:00
NO11 f3c814bf8f Merge pull request 'Add lanterns and chains' (#1983) from AFCMS/MineClone2:lanterns into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1983
 2022-02-11 13:28:55 +00:00
AFCMS 2690094a95 allow placement of lanterns on chains 2022-02-10 11:45:08 +01:00
AFCMS 23873f31f1 add french translation of `mcl_lanterns` 2022-02-09 22:19:24 +01:00
AFCMS 749d4f1a4b add lanterns translation template 2022-02-09 22:15:44 +01:00
AFCMS 8817d51d64 minecraft like lanterns placement limitations 2022-02-09 22:11:50 +01:00
AFCMS 9b375aa9e8 attemp to fix lanterns placement 2022-02-09 18:19:46 +01:00
AFCMS 6b9d4d445f Merge branch 'lanterns' of ssh://git.minetest.land:29418/AFCMS/MineClone2 into lanterns 2022-02-09 12:21:39 +01:00
AFCMS 7fbdd71081 obtimize glass detail images 2022-02-09 12:21:28 +01:00
AFCMS e138d998ef `walkover` fixes 2022-02-09 12:21:28 +01:00
AFCMS 8ca3d311fd nothing 2022-02-09 12:20:54 +01:00
AFCMS e8c3de80f4 Merge branch 'master' into lanterns 2022-02-09 11:19:45 +00:00
AFCMS 9cc088c940 fix lantern light value to fit minetest limit 2022-02-08 23:00:45 +01:00
AFCMS 6572a8c908 add lanterns, crafts, placement mechanism, doc entries 2022-02-08 22:56:20 +01:00
AFCMS ffa9d2d0fd add basic chains and lantern model and API 2022-02-08 10:58:25 +01:00
AFCMS e4f2618a69 Merge pull request 'fixes to `walkover` mod' (#1979) from AFCMS/MineClone2:walkover_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1979
 2022-01-21 09:56:59 +00:00
AFCMS 5f279e68e1 Merge branch 'walkover_fixes' of ssh://git.minetest.land:29418/AFCMS/MineClone2 into walkover_fixes 2022-01-21 09:05:09 +01:00
AFCMS 90f9f2d98d nothing, but gitea is bad 2022-01-21 09:05:01 +01:00
AFCMS a301ecf7a0 Merge branch 'master' into walkover_fixes 2022-01-21 08:04:19 +00:00
AFCMS 5bedae49d6 `walkover` fixes 2022-01-20 22:55:36 +01:00
kay27 7328549d94 Merge pull request 'Obtimize connected glass detail images' (#1978) from AFCMS/MineClone2:glass_opt into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1978

*optimize
 2022-01-20 09:31:59 +00:00
AFCMS d2fa69d4ed obtimize glass detail images 2022-01-20 10:01:59 +01:00
NO11 6f44278414 Merge pull request 'Remove lines about looking at Minecraft source code in CONTRIBUTING.md' (#1973) from GuyLiner/MineClone2:clean_room into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1973
 2022-01-19 15:58:54 +00:00
Guy Liner 9792cb5391 The project's name is Minestom, not Minestorm 2022-01-18 23:33:27 -05:00
Guy Liner 4ae323f8f8 Added back line about Minestorm 2022-01-16 21:19:03 -05:00
GuyLiner 92efe78c6f Merge branch 'master' into clean_room 2022-01-16 19:49:02 +00:00
Guy Liner 1995055d0f Removed lines about looking at Minecraft source code 2022-01-16 14:45:20 -05:00
epCode 9b881df465 Temporarily remove glitchy Elytra crash-damage 
If you fly in certain directions with this damage system, you will die. also if you speed up too fast.
 2022-01-06 21:55:01 +00:00
NO11 4dce90543d Merge pull request 'master' (#13) from MineClone2/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/13
 2022-01-06 16:06:36 +00:00
Elias Fleckenstein a8b974266c Merge pull request 'Add 1024x1024 logo (basic and small versions)' (#1947) from AFCMS/MineClone2:new_logo into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1947
 2022-01-03 17:49:54 +00:00
AFCMS 11f3ad15ba add logo 2022-01-02 18:50:15 +01:00
NO11 627c37cd97 Fix pumpkin hud 2022-01-02 12:37:20 +00:00