Commit Graph

8535 Commits

Author SHA1 Message Date
ChrisPHP
58d36d4596 Added xp earnt from disenchanting, code comments and updated item description 2022-08-17 21:47:00 +01:00
ChrisPHP
91a318ac4e Added name and curse transfer 2022-08-16 22:06:49 +01:00
ChrisPHP
d6a30cacc6 Added grindstone functionality support 2022-08-14 16:49:35 +01:00
ChrisPHP
a356be5f76 Merge pull request 'Merge with master.' (#1) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/ChrisPHP/MineClone2/pulls/1
2022-08-13 10:14:27 +00:00
cora
77cb2277cd Merge pull request 'variable in mcl_beacons gets reinitalized for no reason' (#2562) from minor_beacon_codestyle_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2562
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-13 09:56:53 +00:00
chmodsayshello
21324aa0a5 variable in mcl_beacons gets reinitalized for no reason 2022-08-13 11:54:34 +02:00
cora
b07652d6ca Merge pull request 'elytra physics overhaul' (#2511) from SumianVoice/MineClone2_c:elytra-overhaul into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2511
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-13 09:52:21 +00:00
cora
f48f158f50 Merge pull request 'Set version to 0.79 indev' (#2560) from release_0.78 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2560
2022-08-13 09:10:15 +00:00
cora
3cfa8a848b Set version to 0.79 indev 2022-08-13 03:14:29 +00:00
cora
9231ce0754 Merge pull request 'Release 0.78' (#2559) from release_0.78 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2559
2022-08-13 02:58:57 +00:00
cora
2290968ce9 Set version to 0.78 2022-08-13 04:55:20 +02:00
cora
e8f39deede Update credits 2022-08-13 04:55:10 +02:00
cora
f7ffa6f700 Merge pull request 'Fix villagers positional sounds' (#2556) from villager_sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2556
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-12 22:53:21 +00:00
cora
3620db7c14 Add objectref to villager sound_play for pos sound 2022-08-13 00:47:46 +02:00
cora
68d5a81b1c Villager sounds -> mono 2022-08-13 00:47:46 +02:00
cora
2d35292bc3 Merge pull request 'Enable shadows and waving liquids when supported (5.6)' (#2555) from shadows_waving into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2555
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-12 22:07:55 +00:00
cora
7be8ab2c1c Send shadows to client if server supports it 2022-08-13 00:04:44 +02:00
cora
442fefebf2 Waving water 2022-08-13 00:04:44 +02:00
cora
0debaf12c0 Merge pull request '[heads] heads may now be placed on ceilings, upside down' (#2558) from heads_ceiling into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2558
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-12 21:39:14 +00:00
iliekprogrammar
7482f84929
[heads] heads may now be placed on ceilings, upside down 2022-08-13 02:44:47 +08:00
cora
1bc082ee4f Merge pull request 'Fix items floating into the air under rare circumstances' (#2553) from fix_item_floating into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2553
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-12 13:18:10 +00:00
Sumyjkl
16c9a83a96 fix items floating into the air under rare circumstances 2022-08-12 21:46:17 +10:00
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
cora
c001d307f2 Merge pull request 'Swimming collides with ice properly (clean version of #2536)' (#2551) from ice_coll_fix_clean into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2551
2022-08-11 13:39:38 +00:00
opfromthestart
f0837bdee6 Swimming collides with ice properly 2022-08-11 15:35:40 +02:00
cora
435df92cf9 Merge pull request 'Parrot fixes' (#2549) from parrot_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2549
2022-08-11 12:39:16 +00: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
0bd0abc327 Merge pull request 'Some structures fixes' (#2541) from structure_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2541
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-11 12:31:55 +00: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
cora
db2f2cfc69 Merge pull request '[heads] refactor, delete unnecessary textures and implement 16 direction head nodes' (#2550) from heads_16_direction into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2550
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-11 12:25:34 +00: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
8ff938c3d0 Merge pull request 'Fix dispenser and dropper crash (in 5.4)' (#2544) from fix_dropper_dispenser_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2544
2022-08-10 15:10:40 +00: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: https://git.minetest.land/MineClone2/MineClone2/pulls/2540
2022-08-10 13:54:03 +00:00
cora
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
cora
e8baa1ae00 Fix undeclared var warning in mcl_weather 2022-08-10 14:14:00 +02:00