Commit Graph

7706 Commits

Author SHA1 Message Date
Sumyjkl 307140b9a4 still over it 2022-08-12 13:03:11 +10:00
Sumyjkl 6cab000b2a fix merge conflict 2022-08-12 12:57:21 +10:00
Sumyjkl c36fd90965 Merge remote-tracking branch 'refs/remotes/mclmaster/master'
Conflicts:
	mods/PLAYER/mcl_playerplus/init.lua
2022-08-12 12:55:50 +10:00
Sumyjkl 97472becfc I'm over it. 2022-08-12 02:26:22 +10:00
opfromthestart f0837bdee6 Swimming collides with ice properly 2022-08-11 15:35:40 +02:00
cora 374e30b4a5 stay on players shoulder in when flying in creative 2022-08-11 14:32:58 +02:00
cora 6101de8d68 Fix parrot punch spam 2022-08-11 14:32:58 +02:00
cora 79ce9f89d3 More adaptive foundation height 2022-08-11 14:26:34 +02:00
cora 0bcbea4ce3 Add lots of water lakes to mangrove swamps 2022-08-11 14:26:34 +02:00
cora b7f26e2ddc Add setting to selectively disable strucutres 2022-08-11 14:26:34 +02:00
cora 4f96b38fa3 Make foundations less cubic 2022-08-11 14:26:34 +02:00
cora f1c70fe19d grass border for water lake 2022-08-11 14:26:34 +02:00
cora cef559c573 Fix ruined portals y offset 2022-08-11 14:26:34 +02:00
cora f86898b2f4 make ruined portals rarer 2022-08-11 14:26:34 +02:00
iliekprogrammar efd1a023f0
Merge remote-tracking branch 'origin/master' into heads_16_direction 2022-08-11 18:12:19 +08:00
iliekprogrammar de07209654
[heads] optimize textures
`optipng -strip all -o7 -zm9`
2022-08-11 17:34:20 +08:00
iliekprogrammar 29d221eed5
[heads] remove unnecessarily duplicative textures
these textures are unnecessary to texture the head nodes. we can reuse
the available armor texture for both the headgear/helmet and the nodes.
2022-08-11 17:28:37 +08:00
iliekprogrammar 44d234dd2c
[heads] implement 16 directional head node 2022-08-11 17:21:23 +08:00
iliekprogrammar 3ff9ed4419
[heads] refactor and trivial renames 2022-08-11 16:45:51 +08:00
cora 34ecb782a8 Fix dispenser and dropper crashing in 5.4 2022-08-10 16:58:00 +02:00
cora 70656b42dc Merge pull request 'boats are removed upon being set on fire (#2529)' (#2540) from opfromthestart/MineClone2:boat-fire-fix into master
Reviewed-on: MineClone2/MineClone2#2540
2022-08-10 13:54:03 +00:00
cora e8baa1ae00 Fix undeclared var warning in mcl_weather 2022-08-10 14:14:00 +02:00
cora 701aee3238 Add modname to beacons mod.conf 2022-08-10 14:14:00 +02:00
cora 9603ee606c fix at mod loadtime warning in mcl_info 2022-08-10 14:14:00 +02:00
cora 2436a6d616 Merge pull request 'Fixed remaining get_sky calls (#2538)' (#2542) from opfromthestart/MineClone2:new_sky into master
Reviewed-on: MineClone2/MineClone2#2542
2022-08-10 11:41:19 +00:00
Sumyjkl 25491b3882 prevent player from gaining too much speed by pitching down and spamming jump 2022-08-10 13:24:08 +10:00
SumianVoice 22d296e898 Merge branch 'master' into elytra-overhaul 2022-08-10 00:02:47 +00:00
PrairieWind 70277276b0 Adjusted spawn chance and fixed the walls on generation, thanks cora. 2022-08-09 10:30:48 -06:00
PrairieWind 84691c393d Pillager Outpost, Schematics by RandomLegoBrick 2022-08-09 10:30:48 -06:00
opfromthestart 5da6f6812f faster boat death 2022-08-09 12:23:44 -04:00
opfromthestart b8af222538 Fixed remaining get_sky calls 2022-08-08 20:26:31 -04:00
opfromthestart 8b06e5de87 Merge branch 'master' into boat-fire-fix 2022-08-09 00:16:14 +00:00
opfromthestart 76839961c6 Adds fire and lava collision to boats 2022-08-08 20:12:44 -04:00
opfromthestart e9954d1785 Merge branch 'master' into new_sky 2022-08-08 18:00:03 +00:00
Sumyjkl dd9c8b3f48 more accurate physics again, prevent slow servers having slower flight 2022-08-08 11:50:23 +10:00
Sumyjkl 45c93e0340 accurater physics, can't spam jump to gain speed on flat ground (needs work to allow mc like boosting) 2022-08-08 10:50:06 +10:00
SumianVoice eeca224f7b Merge branch 'master' into elytra-overhaul 2022-08-08 00:19:26 +00:00
opfromthestart 866711a4aa Changed to new get_sky method 2022-08-07 18:19:12 -04:00
PrairieAstronomer a34c9172c4 Fixed light levelwarnings and texture alpha warnings in stonecutter, campfires, and beacon 2022-08-07 21:38:40 +00:00
cora 2c814db0d7 Merge pull request 'Snow layers and blocks drop nothing by hand' (#2532) from SumianVoice/MineClone2_c:snow_drop_fix into master
Reviewed-on: MineClone2/MineClone2#2532
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-07 21:36:22 +00:00
Sumyjkl 99eca2ceb9 player will not be upside down when flying or swimming 2022-08-08 02:05:03 +10:00
Sumyjkl 9fdcfcd898 significanltly more accurate values, much slower, more reliable physics, more comments 2022-08-08 00:05:00 +10:00
Sumyjkl 5a8216ba43 moved functions and constants out of global step (oops) 2022-08-07 23:12:57 +10:00
SumianVoice 49089ed8c4 Merge branch 'master' into elytra-overhaul 2022-08-07 10:18:14 +00:00
Sumyjkl f6148068c5 snow layers and blocks drop nothing by hand 2022-08-07 19:55:01 +10:00
iliekprogrammar 0e999d8bb9
[5.6] remove incorrect marks.
wrong, bad. these are fine.
2022-08-07 13:00:43 +08:00
iliekprogrammar 156aff21a1
[5.6][bows] fix unsafe entity handling for arrows 2022-08-07 12:48:09 +08:00
iliekprogrammar 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
iliekprogrammar 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
iliekprogrammar 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
iliekprogrammar 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
iliekprogrammar 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
Sumyjkl 02c92dc6f8 fix getting wrong node 2022-08-07 01:05:39 +10:00
Sumyjkl 509fadfebb fix is_pressing_jump being global 2022-08-07 00:38:20 +10:00
Sumyjkl 1263c43b5d elytra and other non-combat armour don't take durability damage when the player is attacked 2022-08-06 14:38:42 +10:00
Sumyjkl cd6da88b37 tweaks again 2022-08-05 14:43:48 +10:00
cora 27304d5d96 Nerf shipwreck loot 2022-08-04 04:21:59 +02:00
SumianVoice 3f73dc1794 Merge branch 'master' into mcl_burning_depend 2022-08-03 12:55:07 +00:00
Sumyjkl eb89466436 add dependency for mcl_weather to mcl_burning to hopefully avoid crashes 2022-08-03 22:45:15 +10:00
cora e901003e22 Fix mangrove (trap)door, stair and slab recipes 2022-08-03 11:57:17 +02:00
Sumyjkl 3c0992e58d tweaks 2022-08-03 18:41:51 +10:00
cora c36b359c70 Fix mangrove roots and water logged roots(somewhat) 2022-08-03 00:00:44 +02:00
cora 191e117e05 Axe can strip mangrove wood 2022-08-02 23:51:48 +02:00
Sumyjkl 4df51bac72 code quality, minor tweaks 2022-08-03 01:03:28 +10:00
Sumyjkl b7a5a74ccf less pitch up slowdown 2022-08-03 00:14:31 +10:00
Sumyjkl ece79cad8a prevent player from getting hyperspeed while flying from ground 2022-08-03 00:08:30 +10:00
Sumyjkl 845e43c143 tweaked several things 2022-08-02 23:51:21 +10:00
Sumyjkl aa93ce4b3a tweaked slowdown on pitch up 2022-08-02 23:45:20 +10:00
Sumyjkl 12af0e7de8 semi-working on 0.3 server step 2022-08-02 23:42:04 +10:00
Sumyjkl 32a57133ac use dtime 2022-08-02 22:47:51 +10:00
Sumyjkl 5c085bd28f prevent player gaining infinite momentum by spamming jump while running, added dtime dependent velocity 2022-08-02 22:06:19 +10:00
Sumyjkl c80012a14f fix gravity not being reset when died after rocketing 2022-08-02 21:23:05 +10:00
SumianVoice e28c0d311a Merge branch 'master' into elytra-overhaul 2022-08-02 10:27:14 +00:00
cora 1065165952 fix mangrove trapdoor 2022-08-02 12:06:13 +02:00
cora c0fec69c70 Add plantlike_rooted propagules 2022-08-02 12:02:20 +02:00
cora 844cf6c5dc Fix waterlogged texture to be animated 2022-08-02 12:02:20 +02:00
cora 2b90675ea2 fix warnings 2022-08-02 12:02:20 +02:00
cora 8e41d5a1f4 Fix propagule growth 2022-08-02 12:02:20 +02:00
cora 811d7a778f Add tall mangrove tree schematics 2022-08-02 12:02:20 +02:00
cora 4491e962d5 grand mcl_mangrove cleanup 2022-08-02 12:02:20 +02:00
cora 77c878f609 make waterlogged roots work with river water 2022-08-02 12:02:20 +02:00
cora 51f79eaa39 Add lilypads and dead bushes 2022-08-02 12:02:20 +02:00
cora 3bf45ec4e9 Spawn mangroves in shallow water, fix schematics 2022-08-02 12:02:20 +02:00
cora e8fc56ab33 Fix water- and mudlogged roots, add w. logging abm 2022-08-02 12:02:20 +02:00
cora f003aefe19 allow coral reefs in MangroveSwamps 2022-08-02 12:02:20 +02:00
Thunder1035 d284ddf150 Add mangrove trees 2022-08-02 12:02:20 +02:00
cora 09889ca927 Add MangroveSwamp biome defs 2022-08-02 12:02:20 +02:00
cora 4b5476dbff fix end sky and void crash 2022-08-02 11:55:55 +02:00
cora a2b003a195 sky slightly overcast on weather in non-weather b. 2022-08-02 11:55:55 +02:00
cora ee3b98c809 Fix skybox in non-weather areas 2022-08-02 11:55:55 +02:00
cora 4a6f98636d fix crash in mapgen v6 2022-08-02 11:55:55 +02:00
cora cae11f99e4 fix wrong mapgen setting var 2022-08-02 11:55:55 +02:00
cora bb496db605 use _mcl_biome_type for weather 2022-08-02 11:55:55 +02:00
cora 50840f6bdc No nether rain lol 2022-08-02 11:55:55 +02:00
cora 05a6f09f05 Never rain in deserts 2022-08-02 11:55:55 +02:00
cora 2aaeed7720 Pile up snow while snowing 2022-08-02 11:55:55 +02:00
cora eb5378afec Rain and snow where appropriate(biome, heat, alt) 2022-08-02 11:55:55 +02:00
SumianVoice fab3c35c28 Merge branch 'master' into elytra-overhaul 2022-08-02 09:44:51 +00:00
Sumyjkl 0f6a51a031 remove unused file scope variables 2022-08-02 18:39:15 +10:00
Sumyjkl 1468acf6d4 move player up to give clearance when start flying 2022-08-02 18:26:00 +10:00