Commit graph

6268 commits

Author SHA1 Message Date
kay27
beb2484224 Merge https://git.minetest.land/MineClone2/MineClone2/pulls/1366 2021-04-05 13:50:26 +04:00
kay27
3ea4de1538 Merge pull request 'Add whirlpools' (#1464) from j1233/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1464
2021-04-05 09:32:19 +00:00
j1233
f0a67cf749 add whirlpools 2021-04-05 09:19:05 +00:00
AFCMS
28402ca663 store tool wield scale in a global var 2021-04-05 10:16:56 +02:00
Elias Fleckenstein
e407ad2254 Fix #1447 2021-04-05 09:25:03 +02:00
Elias Fleckenstein
b1c4476a04 Merge pull request 'Add End main island generation' (#1459) from end_main_island into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1459
2021-04-05 07:02:48 +00:00
kay27
f28d8632a4 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-05 05:00:57 +04:00
kay27
b1f27dba6a Merge pull request 'Make horse taming more similar to minecraft (#1249)' (#1460) from slaesvuo/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1460
2021-04-05 01:00:17 +00:00
kay27
4bc93040d5 Merge pull request 'Fix large and small slimes and magma cubes not dropping xp and loot' (#1461) from ztianyang/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1461
2021-04-05 00:58:18 +00:00
kay27
5fc3bb11ef [tools] Add simple python script to entirely reset End dimension generated before and get fresh one, improved (but please stop server & backup world before) 2021-04-05 04:54:58 +04:00
kay27
67e8dd2aa1 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-05 04:42:47 +04:00
ztianyang
1e1d31b57b Merge branch 'master' into master 2021-04-04 23:57:20 +00:00
epCode
a6f0ad13a0 Make blaze burning better 2021-04-04 16:46:44 -07:00
epCode
93684baa86 Make Blazes have more Mc-likeness ;) 2021-04-04 16:32:58 -07:00
Tianyang Zhang
8bb8a0e3b2 Fix large and small slimes and magma cubes not dropping xp and loot 2021-04-04 15:40:10 -07:00
Saku Laesvuori
c5e1734c1c Make horse taming more similar to minecraft (#1249)
In minecraft horses are tamed by trying to ride them and they can also
be fed to speed up taming. This commit implements both of those
features and disables the old and broken taming system for horses.
2021-04-04 23:24:28 +03:00
Elias Fleckenstein
90f312f772 Add credits overlay prototype 2021-04-04 19:13:46 +02:00
Elias Fleckenstein
1144006cdd Add End main island generation 2021-04-04 15:16:06 +02:00
kay27
3e0bbda3f7 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-04 14:20:01 +04:00
kay27
f54f4ebcf9 Merge pull request 'Fix passive mobs despawning' (#1458) from slaesvuo/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1458
2021-04-04 10:18:36 +00:00
Elias Fleckenstein
598692cf8c Add nil check to prevent crashes with mcl_throwing 2021-04-04 12:10:21 +02:00
Elias Fleckenstein
ff538d51bd Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-04 12:01:59 +02:00
Elias Fleckenstein
49446bbb7b Make enderdragon spawn upon exit portal generation 2021-04-04 12:01:45 +02:00
kay27
48286d4ac1 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-04 10:37:39 +04:00
Saku Laesvuori
4a085c9526 Fix passive mobs despawning
According to the wiki most passive mobs do not despawn. The ones that do
have already been explicity marked as despawning.

<https://minecraft.fandom.com/wiki/Spawn#Despawning>
<https://minecraft.fandom.com/wiki/Mob#Despawning>
2021-04-04 09:15:25 +03:00
epCode
ac87e0604e make ghast firing more MC-like 2021-04-03 18:39:20 -07:00
jordan4ibanez
f8229def5e Merge pull request 'Fix locationless playing when picking up items' (#1457) from jordan4ibanez/MineClone2-PopSounds:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1457
2021-04-04 01:10:19 +00:00
jordan4ibanez
90fd65ac66 Fix locationless playing 2021-04-03 21:09:43 -04:00
epCode
40b07e466b make ghast fireballs deflectible 2021-04-03 18:07:51 -07:00
jordan4ibanez
0b0a180343 Merge pull request 'Fix local name memory leak' (#1456) from jordan4ibanez/MineClone2-PopSounds:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1456
2021-04-04 01:05:56 +00:00
jordan4ibanez
1b511936f5 Fix local name memory leak 2021-04-03 21:05:31 -04:00
jordan4ibanez
441ce5522a Merge pull request 'Adjust the volume even more to perfectly match the gameplay' (#1455) from jordan4ibanez/MineClone2-PopSounds:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1455
2021-04-04 00:56:17 +00:00
jordan4ibanez
a807ee6372 Adjust the volume even more to perfectly match the gameplay 2021-04-03 20:55:46 -04:00
jordan4ibanez
f1863baedc Merge pull request 'Adjust volume and pitch of item collection sound' (#1454) from jordan4ibanez/MineClone2-PopSounds:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1454
2021-04-04 00:54:33 +00:00
jordan4ibanez
0641f09915 Adjust volume of item collection sound 2021-04-03 20:53:34 -04:00
jordan4ibanez
bb6cce06e5 Merge pull request 'Add sound buffer and different item collection sound' (#1453) from jordan4ibanez/MineClone2-PopSounds:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1453
2021-04-04 00:39:52 +00:00
jordan4ibanez
c572db92aa Add sound buffer and different item collection sound 2021-04-03 20:39:08 -04:00
kay27
70f1434da6 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-03 14:05:47 +04:00
jordan4ibanez
b14bc21829 Minor update to home directory warning in minetest.conf 2021-04-03 05:26:08 +00:00
jordan4ibanez
269ed6b3eb Merge pull request 'Update tick rate to 0.05 ticks per second (20 tps)' (#1446) from jordan4ibanez/MineClone2-TickRateAdjustment:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1446
2021-04-03 05:22:50 +00:00
jordan4ibanez
da3d5025a8 Update tick rate to 0.05 ticks per second (20 tps) 2021-04-03 01:22:13 -04:00
jordan4ibanez
43c47bbe0f Merge pull request 'Revert to previous style of interpolated move_to with tweaks' (#1445) from jordan4ibanez/MineClone2-ManualItemPickupInterpolation:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1445
2021-04-03 02:02:58 +00:00
jordan4ibanez
844db8aa7b Revert to previous style of interpolated move_to with tweaks 2021-04-02 22:02:19 -04:00
jordan4ibanez
22cbfa32de Merge pull request 'Adjust the item collection magnet even more' (#1444) from jordan4ibanez/MineClone2-ManualItemPickupInterpolation:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1444
2021-04-03 01:58:08 +00:00
jordan4ibanez
0840ad98a2 Adjust the item collection magnet even more 2021-04-02 21:57:38 -04:00
jordan4ibanez
ea54936d28 Merge pull request 'Smoothen out item collection to accommodate for move_to interpolation issues' (#1443) from jordan4ibanez/MineClone2-ManualItemPickupInterpolation:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1443
2021-04-03 01:52:18 +00:00
jordan4ibanez
1cbd3a998d Use manual move_to to account for move_to interpolation issues 2021-04-02 21:50:47 -04:00
jordan4ibanez
61e812e40a Add in manual interpolation into the item magnet 2021-04-02 21:40:04 -04:00
jordan4ibanez
b83b4c55fa Merge pull request 'More fixes to item collection on laggy servers' (#1442) from jordan4ibanez/MineClone2-FixA:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1442
2021-04-03 00:43:42 +00:00
jordan4ibanez
18d7be4a4f More fixes to item collection on laggy servers 2021-04-03 00:42:20 -04:00