Doods
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
7,475 Commits 77 Branches 80 Tags 179 MiB
Commit Graph

7475 Commits

Author SHA1 Message Date
cora bcf302ceb0 Merge pull request 'Rename a few textures to help support texture packs.' (#2045) from MysticTempest/MineClone2:Texture_pack_support into master 
Reviewed-on: MineClone2/MineClone2#2045
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-05 02:57:00 +00:00
MysticTempest 7a53ea8b70 Rename a few textures to help support texture packs. 2022-03-02 20:13:24 -06:00
cora e8ff33a741 Merge pull request 'Alternative solution to fix crash on nether portal destruction' (#2029) from ryvnf-portal-removal into master 
Reviewed-on: MineClone2/MineClone2#2029
 2022-03-03 01:51:49 +00:00
Elias Åström 3c10f0e970 Rewrite portal removal to avoid stack overflow 
This solves a problem were nether portal removal would trigger deep
recursion through node callbacks.  For large portals this could result
in stack overflow crashes on LuaJIT.  The issue is solved by rewriting
the portal removal to avoid recursion and removing the portal in one
operation using minetest.bulk_set_node.
 2022-03-03 01:42:49 +00:00
cora f7d712543f Merge pull request 'Fix fire HUD' (#2042) from kabou/MineClone2:fix-burning-HUD into master 
Reviewed-on: MineClone2/MineClone2#2042
 2022-03-03 01:40:05 +00:00
kabou c3e0996902 Fix fire HUD not showing on join while burning. 
* Add the fire HUD to a player who joins the server while still burning
  from the previous session.
 2022-03-02 17:15:05 +01:00
kabou d424d4f10e Add comments to mcl_burning.update_hud(). 2022-03-02 16:39:27 +01:00
kabou e80006f4ea Do not set fire to objects that are already burning. 
Changes to mcl_burning.set_on_fire():
* Add logic that only updates the burn time, but skips adding fire
  entities to objects that are already burning.
* Condense code a little, remove single use variables.
* Add a comment to a questionable piece of code.
* Add comments to the function.
 2022-03-02 16:25:40 +01:00
kabou b17776699e Add comments to "storage" table. 
* Document attributes of the "storage" table.
 2022-03-02 15:40:29 +01:00
kabou 86a4ece7d2 Add local copy of minetest.find_nodes_in_area. 2022-03-02 15:25:03 +01:00
kabou df5d24104d Make player burning HUD work without csm. 
* Add update_hud() function.
* Remove the client channels.
* Unglobalize animation_frames variable.
* Fix bug where player state was not stored on shutdown of singleplayer
  game.
* Remove superfluous sanity_check() function, this code could easily be
  inlined in its only caller.
 2022-03-02 15:21:55 +01:00
cora 8dd540269c Merge pull request 'Fix burning entity animation.' (#2039) from kabou/MineClone2:fix-burning-entities into master 
Reviewed-on: MineClone2/MineClone2#2039
 2022-03-02 11:34:37 +00:00
kabou 56b63463a5 Fix burning entity animation. 
The parameters for the flames sprite were incorrect, causing the reverse
side of the sprite to appear as an opaque black rectangle.  Use the
correct incantation.
 2022-03-02 10:47:46 +01:00
cora c2ae28aec1 Merge pull request 'Fix TGA file writing on Windows' (#1985) from fix-tga-file-writing-on-windows into master 
Reviewed-on: MineClone2/MineClone2#1985
Reviewed-by: AFCMS <afcms@noreply.git.minetest.land>
 2022-02-28 17:10:51 +00:00
Nils Dagsson Moskopp 66bb209ad1 Fix TGA file writing on Windows 
Before this patch, the tga_encoder mod would write corrupted TGA files
on Windows: Bytes that looked like newlines were replaced by a carriage
return and a newline.
 2022-02-28 16:58:59 +00:00
cora a3e01e6dbe Merge pull request 'Add Target' (#2033) from AFCMS/MineClone2:target into master 
Reviewed-on: MineClone2/MineClone2#2033
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-02-27 17:25:16 +00:00
AFCMS 5a7b1cc382
make all arrow types activate target (+ depends and code fixes) 2022-02-26 23:52:03 +01:00
AFCMS 210a0d8ee1
make lingering potions activate target (+ indentation fix) 2022-02-26 22:44:50 +01:00
AFCMS eae8effd57
make splash potions activate target 2022-02-26 22:42:27 +01:00
AFCMS b51e322304
make fire charges activate target (+ fix possible crash) 2022-02-26 22:38:34 +01:00
AFCMS 096d46152e
make bottle o enchanting activate target 2022-02-26 22:20:05 +01:00
AFCMS d89687984b
make ender pearls activate target 2022-02-26 22:16:10 +01:00
AFCMS c6f72c473f
make eggs activate target 2022-02-26 22:12:26 +01:00
AFCMS 540b72f1d6
add target help text 2022-02-26 19:12:02 +01:00
AFCMS 7449725a56
add target crafting receipe 2022-02-26 19:12:01 +01:00
AFCMS 9e7a525a0a
make snowballs activate target 2022-02-26 19:12:01 +01:00
AFCMS 4bd91750bc
add target with API 2022-02-26 19:12:01 +01:00
cora 8e1a9e1785 Merge pull request 'mapgen/mcl_mapgen_core: move set_node decorations a node callback' (#2028) from fix-nether-wart into master 
Reviewed-on: MineClone2/MineClone2#2028
 2022-02-25 21:28:40 +00:00
E 87e494f42b mapgen/mcl_mapgen_core: move set_node decorations a node callback 
During the rewrite in 89e55e9065, a queue system was added to allow
using both VoxelManip-based generation steps, and set_node-based steps,
however some set_node-based steps (underground mushrooms, nether
decorations, and structures) were missed and remained in a VoxelManip
step. The result is that the changes made by the set_node stages were
overwritten after the (now-stale) VoxelManip data was committed later.

(ref. Mineclonia/Mineclonia#26)
 2022-02-25 18:38:50 +01:00
cora dfed21ee14 Merge pull request 'Revert mob rewrite' (#1992) from revert-to-oldmobs into master 
Reviewed-on: MineClone2/MineClone2#1992
 2022-02-25 16:47:47 +00:00
cora 3feca330c9 fix the other 2 throw_xp occurences 2022-02-25 00:40:26 +00:00
cora caacb378de fix api change in enchanting 2022-02-25 00:40:26 +00:00
cora 379972ea11 fix crash when blaze attacks logged off player 2022-02-25 00:40:26 +00:00
cora 414e2e7725 fix crash on opening villager formspec 2022-02-25 00:40:26 +00:00
cora 435b5d756d throw_experience->throw_xp (api change) 2022-02-25 00:40:26 +00:00
cora 2bb416765c revert to old mobs ( 32c03dc27e ) 
This reverts the hierarchies ENTITIES/mcl_mobs, ENTITIES/mobs_mc
and ENTITIES/mobs_mc_gameconfig to the state of commit
32c03dc27e
 2022-02-25 00:40:26 +00:00
cora 02361b2d01 Merge pull request 'ITEMS/mcl_fire: fix laggy fire spread' (#1998) from fix-fire into master 
Reviewed-on: MineClone2/MineClone2#1998
 2022-02-25 00:17:47 +00:00
cora 86ca401e4e do not randomseed twice 2022-02-25 00:08:26 +00:00
cora 378b5b30c9 fix beds dropping when burning up 2022-02-25 00:08:26 +00:00
cora 840b705a22 make fire use abms instead of laggy node timers 2022-02-25 00:08:26 +00:00
cora 80c79dde1c Merge pull request 'Fix handheld maps not displaying in Minetest 5.5.0' (#2010) from fix-mcl-maps-in-minetest-5.5 into master 
Reviewed-on: MineClone2/MineClone2#2010
 2022-02-24 22:47:26 +00:00
Nils Dagsson Moskopp 27842aa2f5 Fix handheld maps not displaying in Minetest 5.5.0 
The function dynamic_add_media() was changed in incompatible ways in
several minor versions of Minetest, breaking the display of handheld
maps in Minetest 5.5.0. This patch makes handheld maps display there.

The function was blocking with one argument in Minetest 5.3. It was also
blocking in Minetest 5.4, but took an additional argument for a function
to execute once the media had been received. Calling dynamic_add_media()
with a single argument had been deprecated; a function that did nothing
was provided in mcl_maps to satisfy the changed argument requirements.

In Minetest 5.5, dynamic_add_media() was changed to non-blocking. This
introduced a race condition in mcl_maps, where a client often tried to
display a map before it had received the map texture from the server.

Opening an issue on the Minetest issue tracker led to it being closed in
about 20 minutes: <https://github.com/minetest/minetest/issues/11997>
 2022-02-24 22:43:45 +00:00
cora 85e0e23c76 Merge pull request 'Fix redstone comparator flooding crash by erlehmann' (#2027) from fix-comparator-crash into master 
Reviewed-on: MineClone2/MineClone2#2027
 2022-02-24 21:35:12 +00:00
Nils Dagsson Moskopp 41550da87b Fix redstone comparator flooding crash 
Redstone comparators have two modes, comparison mode & subtraction mode.
Before this patch, the functions to turn comparators on or off attempted
to swap nodes with comparators in the same mode, but failed to determine
the correct replacement node, if the existing node was not a comparator.

When a comparator in an on state (e.g. powered by a filled cauldron) was
flooded, the flooding dropped the comparator and replaced the comparator
node that was to be swapped out with air, which lead to a server crash.

This patch changes the functions that turn comparators on or off so they
only swap existing nodes with comparators in the same mode if the name
of the replacement node can be determined – i.e. if it is not nil.
 2022-02-24 15:52:01 +01:00
cora a4e541bcd2 Merge pull request 'remove blend1 file / add blend1 files to gitignore (fix #2015)' (#2024) from AFCMS/MineClone2:remove-blend1 into master 
Reviewed-on: MineClone2/MineClone2#2024
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
 2022-02-24 14:48:51 +00:00
AFCMS 89a930ace3
add `.blend2` and `.blend3` files to gitignore 2022-02-24 10:16:48 +01:00
AFCMS 129117efb3
add `.blend1` files to gitignore 2022-02-24 10:16:47 +01:00
AFCMS cbfc71705d
remove blender backup file 2022-02-24 10:16:47 +01:00
cora 4b89398b3b Merge pull request 'Fix hopper breakage in get_item_group return value. (Fixes: #2022)' (#2023) from kabou/MineClone2:fix-hoppers into master 
Reviewed-on: MineClone2/MineClone2#2023
Reviewed-by: AFCMS <afcms@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-02-24 02:23:09 +00:00
kabou 5431e206b0 Fix hopper breakage in get_item_group return value. 
In commit 55009c257e that added vectors to
mcl_composters, mcl_hoppers was accidentally patched with a unrelated
change, updating it to get_item_group().  This mostly works, but in one
particular case the semantics of the return value differs.  Instead of
returning 'nil' it returns '0'.  That altered the evaluation of an if
condition, breaking the abm that sucks in items.

This commit fixes the conditional by explicitly comparing  '~= 0'.
 2022-02-24 03:18:25 +01:00