70656b42dc
Merge pull request 'boats are removed upon being set on fire ( #2529 )' ( #2540 ) from opfromthestart/MineClone2:boat-fire-fix into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2540
2022-08-10 13:54:03 +00:00
953fe4df39
Merge pull request 'Fix some warnings' ( #2539 ) from fix_some_warnings into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2539
2022-08-10 12:17:14 +00:00
e8baa1ae00
Fix undeclared var warning in mcl_weather
2022-08-10 14:14:00 +02:00
701aee3238
Add modname to beacons mod.conf
2022-08-10 14:14:00 +02:00
9603ee606c
fix at mod loadtime warning in mcl_info
2022-08-10 14:14:00 +02:00
2436a6d616
Merge pull request 'Fixed remaining get_sky calls ( #2538 )' ( #2542 ) from opfromthestart/MineClone2:new_sky into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2542
2022-08-10 11:41:19 +00:00
9083552939
Merge pull request 'Pillager Outpost' ( #2535 ) from pillager_outpost into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2535
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-09 20:59:38 +00:00
70277276b0
Adjusted spawn chance and fixed the walls on generation, thanks cora.
2022-08-09 10:30:48 -06:00
84691c393d
Pillager Outpost, Schematics by RandomLegoBrick
2022-08-09 10:30:48 -06:00
5da6f6812f
faster boat death
2022-08-09 12:23:44 -04:00
b8af222538
Fixed remaining get_sky calls
2022-08-08 20:26:31 -04:00
8b06e5de87
Merge branch 'master' into boat-fire-fix
2022-08-09 00:16:14 +00:00
76839961c6
Adds fire and lava collision to boats
2022-08-08 20:12:44 -04:00
8d6a0bb564
Merge pull request 'fix deprecated player:get_sky ( #2528 )' ( #2534 ) from opfromthestart/MineClone2:new_sky into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2534
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-08 23:16:18 +00:00
e9954d1785
Merge branch 'master' into new_sky
2022-08-08 18:00:03 +00:00
866711a4aa
Changed to new get_sky method
2022-08-07 18:19:12 -04:00
96ceb2fabb
Merge pull request 'Light Level and Texture Clip Warning Fixes' ( #2527 ) from fix_campfire_errors into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2527
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-07 21:40:21 +00:00
a34c9172c4
Fixed light levelwarnings and texture alpha warnings in stonecutter, campfires, and beacon
2022-08-07 21:38:40 +00:00
2c814db0d7
Merge pull request 'Snow layers and blocks drop nothing by hand' ( #2532 ) from SumianVoice/MineClone2_c:snow_drop_fix into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2532
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-07 21:36:22 +00:00
7b92bb89ce
Merge pull request '[5.6] safely handle entities involving set_hp' ( #2526 ) from iliekprogrammar/MineClone2:safe_entity_handling into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2526
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-07 21:05:11 +00:00
f6148068c5
snow layers and blocks drop nothing by hand
2022-08-07 19:55:01 +10:00
0e999d8bb9
[5.6] remove incorrect marks.
...
wrong, bad. these are fine.
2022-08-07 13:00:43 +08:00
156aff21a1
[5.6][bows] fix unsafe entity handling for arrows
2022-08-07 12:48:09 +08:00
4f2789c498
[5.6][armor] fix unsafe entity handling (unsure)
...
i'm not sure about this one, can't fnd a suitable test for it.
2022-08-07 12:43:24 +08:00
bf80074d98
[5.6][mobs] fix unsafe entity handling (unsure)
...
i'm not sure about this one, can't find a suitable test for it.
2022-08-07 12:38:26 +08:00
4b31692319
[5.6][boats] fix unsafe entity handling
...
this probably does not affect normal gameplay, unless you can set boats on fire somehow
2022-08-07 12:09:12 +08:00
bce4d29737
[5.6][lightning] fix unsafe entitiy handling
...
this does not excuse all on_strike callbacks to allow oversights.
it must also track entity removal.
2022-08-07 10:44:13 +08:00
221ee0fcf1
[5.6] mark places with unsafe set_hp entity handling
...
There might be other places i might be missing, but these are the obvious ones.
leftover entity handling i did not mark:
* everything that involves a apply()-like algorithm (e.g. callbacks) over the
same list of objects.
* in mcl_damage, it's not known whether mcl_damage.from_mt() would involve
entity handling or just player handling.
2022-08-07 00:13:03 +08:00
3922c5bdca
Merge pull request 'Nerf shipwreck loot' ( #2519 ) from fix_shipwreck_loot into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2519
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2022-08-04 22:58:27 +00:00
27304d5d96
Nerf shipwreck loot
2022-08-04 04:21:59 +02:00
c8012ccffd
Merge pull request 'add dependency for mcl_weather to mcl_burning to hopefully avoid crashes' ( #2516 ) from SumianVoice/MineClone2_c:mcl_burning_depend into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2516
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-04 01:49:13 +00:00
3f73dc1794
Merge branch 'master' into mcl_burning_depend
2022-08-03 12:55:07 +00:00
eb89466436
add dependency for mcl_weather to mcl_burning to hopefully avoid crashes
2022-08-03 22:45:15 +10:00
d1d2b03635
Merge pull request 'Add mangrove swamps' ( #2503 ) from mangrove_swamps into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2503
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-03 10:39:20 +00:00
e901003e22
Fix mangrove (trap)door, stair and slab recipes
2022-08-03 11:57:17 +02:00
c36b359c70
Fix mangrove roots and water logged roots(somewhat)
2022-08-03 00:00:44 +02:00
191e117e05
Axe can strip mangrove wood
2022-08-02 23:51:48 +02:00
1065165952
fix mangrove trapdoor
2022-08-02 12:06:13 +02:00
c0fec69c70
Add plantlike_rooted propagules
2022-08-02 12:02:20 +02:00
844cf6c5dc
Fix waterlogged texture to be animated
2022-08-02 12:02:20 +02:00
2b90675ea2
fix warnings
2022-08-02 12:02:20 +02:00
8e41d5a1f4
Fix propagule growth
2022-08-02 12:02:20 +02:00
811d7a778f
Add tall mangrove tree schematics
2022-08-02 12:02:20 +02:00
4491e962d5
grand mcl_mangrove cleanup
2022-08-02 12:02:20 +02:00
77c878f609
make waterlogged roots work with river water
2022-08-02 12:02:20 +02:00
51f79eaa39
Add lilypads and dead bushes
2022-08-02 12:02:20 +02:00
3bf45ec4e9
Spawn mangroves in shallow water, fix schematics
2022-08-02 12:02:20 +02:00
e8fc56ab33
Fix water- and mudlogged roots, add w. logging abm
2022-08-02 12:02:20 +02:00
f003aefe19
allow coral reefs in MangroveSwamps
2022-08-02 12:02:20 +02:00
d284ddf150
Add mangrove trees
2022-08-02 12:02:20 +02:00
cora
cora
PrairieWind
opfromthestart
Sumyjkl
iliekprogrammar
SumianVoice
Thunder1035