Commit Graph

5918 Commits

Author SHA1 Message Date
Elias Fleckenstein
421ab9f660 Add timeout to static hudbars 2021-04-13 08:42:17 +02:00
Elias Fleckenstein
5ddd1d0193 Merge branch 'master' into beta 2021-04-13 08:33:31 +02:00
Elias Fleckenstein
037832a177 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-13 08:06:28 +02:00
epCode
424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
Elias Fleckenstein
5028728fbc Merge branch 'master' into faithful 2021-04-12 17:54:20 +02:00
Elias Fleckenstein
6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Elias Fleckenstein
f540bc2bb1 Merge branch 'master' into beta 2021-04-12 17:31:58 +02:00
Elias Fleckenstein
5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master""
This reverts commit 615b15f1331d34c1b5c8e339cc025309b13eecca.
2021-04-12 16:36:08 +02:00
Elias Fleckenstein
d3a3253563 Revert "Revert "Make hoe dig some blocks faster""
This reverts commit db5626fcb480a7ec3fcb1b2dd064cf8b14d2a260.
2021-04-12 16:34:40 +02:00
Elias Fleckenstein
c3868084af Revert "Fix crash with removed hoey diggroup"
This reverts commit ed7099fefc3f0091426cc2b61c9bb19ed8b96846.
2021-04-12 16:34:25 +02:00
Elias Fleckenstein
0d5933b95e Remove debug printin mcl_mobs 2021-04-12 15:45:00 +02:00
Elias Fleckenstein
615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"
This reverts commit 7a8079bb64e02691352001927514bdeed40ce12b, reversing
changes made to 849823af1f4d381f85fe8fed4faa96171c92284a.
2021-04-12 15:25:31 +02:00
Elias Fleckenstein
ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Elias Fleckenstein
db5626fcb4 Revert "Make hoe dig some blocks faster"
This reverts commit c1e295de5fbe09c2fa6973f14b48dd73b2405eb3.
2021-04-12 15:05:01 +02:00
Elias Fleckenstein
523a0c54d6 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:14 +02:00
Elias Fleckenstein
b914e088cc Update README files 2021-04-12 14:03:51 +02:00
Elias Fleckenstein
c0a31f0e9c Fix #1535 2021-04-11 17:30:32 +02:00
Elias Fleckenstein
24f8f9166b Fix #1528 2021-04-11 17:29:05 +02:00
Elias Fleckenstein
af044e6a96 Bossbars: Add support for non-mob bosses 2021-04-11 11:15:09 +02:00
Elias Fleckenstein
2313012f60 Fix #1528 2021-04-11 10:41:11 +02:00
epCode
ce49cd02ac make player collision box MUCH closer to MC 2021-04-10 15:41:50 -07:00
kay27
40c733c913 [mobs_mc] Remove goto from enderman.lua 2021-04-11 02:11:14 +04:00
kay27
a76fe2b487 [mcl_mobs] Replace goto to repeat-break-until true in spawning.lua 2021-04-11 02:11:06 +04:00
kay27
b14ca5a843 Revert "[mcl_mobs, mobs_mc] TEMP! Remove goto to run on RasbPI4, Oil_boi free to revert"
This reverts commit ea41c82834d1664ba29d41adddf532c4d5121250.
2021-04-11 02:10:27 +04:00
epCode
3ff214ec2d lessen the push strength for players 2021-04-10 15:06:16 -07:00
epCode
f6db31eae3 add criticle and sprint hits. 2021-04-10 14:47:26 -07:00
Elias Fleckenstein
9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27
ea41c82834 [mcl_mobs, mobs_mc] TEMP! Remove goto to run on RasbPI4, Oil_boi free to revert 2021-04-10 20:47:55 +02:00
Elias Fleckenstein
2116b2b9d0 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-10 20:05:09 +02:00
epCode
08b7340ff5 Fix crash with player near unknown object 2021-04-10 10:20:38 -07:00
NO11
cdd12a0c71 Charcoal made from debarked wood 2021-04-10 11:19:51 +00:00
NO11
652f8d48ed Debark wood with an axe 2021-04-09 22:16:52 +00:00
NO11
988f298375 Add stripped wood crafting 2021-04-09 22:13:50 +00:00
NO11
c73cd8b810 Add stripped spruce textures 2021-04-09 22:11:32 +00:00
NO11
ebd4380c98 Add stripped oak textures 2021-04-09 22:10:47 +00:00
NO11
3d732c2412 Add stripped jungle textures 2021-04-09 22:10:10 +00:00
NO11
03e112ef9b Add stripped dark oak textures 2021-04-09 22:09:16 +00:00
NO11
9b81a4d83e Add stripped birch textures 2021-04-09 22:08:39 +00:00
NO11
cbcaef19c6 Add stripped acacia textures 2021-04-09 22:07:44 +00:00
NO11
9e5fb7f533 Add #490 2021-04-09 22:04:42 +00:00
epCode
849823af1f Add player pushing ;) 2021-04-09 14:33:14 -07:00
kay27
d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce
This reverts commit f5f6e232cc9e1f6e33810a8b04a8f652fb90091e.
2021-04-09 19:03:45 +04:00
kay27
3375e903ce [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 18:52:33 +04:00
AFCMS
f5f6e232cc Attemp to fix #1513 2021-04-09 16:46:41 +02:00
Elias Fleckenstein
c6ffccfef5 Add priority to bossbars; display bossbars of closest bosses first 2021-04-09 13:35:58 +02:00
Elias Fleckenstein
cbd2731e06 Improve mcl_bossbars performance 2021-04-09 13:22:45 +02:00
kay27
a733eb8e0c [mesecons] Localise several things in internal.lua 2021-04-09 02:08:03 +04:00
Nils Dagsson Moskopp
7c8cf6f79f Do not crash server if world border is depowered 2021-04-09 01:33:22 +04:00
kay27
f0c2eb86a2 Revert (3/3) "Fix extreme mesecons/redstone crashing at world border"
This reverts commit 0842a36aa6f4a45a10a3ec1182dedcec1d4aac61.
2021-04-09 01:32:58 +04:00
kay27
26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash"
This reverts commit b9d175e6a5d6654b19098c7943a4e14ca8e43eb1.
2021-04-09 01:32:27 +04:00
kay27
6b31e85385 Revert (1/3) "Revert fixes to crash world border"
This reverts commit 18f73ba31f3669b49a573fe6cc15050c81fe31db.
2021-04-09 01:31:21 +04:00
jordan4ibanez
6279f5eb41 test 2021-04-08 23:58:12 +04:00
jordan4ibanez
9789cf5dcd Adjust spawning to be closer and more frequent 2021-04-08 23:58:12 +04:00
jordan4ibanez
26847bbb54 Finish mob limiter 2021-04-08 23:58:12 +04:00
jordan4ibanez
4fca50dead Fix spawn timer reset debug 2021-04-08 23:58:12 +04:00
jordan4ibanez
310dcf9660 Fix forgotten biome check 2021-04-08 23:58:11 +04:00
jordan4ibanez
ba9866db49 merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
282ba2614a merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
26ef8c2674 Fix silverfish typo 2021-04-08 23:58:11 +04:00
jordan4ibanez
f5cc2bab09 Readjust mobs internal settings to not cause insane memory usage 2021-04-08 23:58:11 +04:00
jordan4ibanez
71c50042e6 Fix typo 2021-04-08 23:58:11 +04:00
jordan4ibanez
ae0c235c1f Combine air and ground type spawning into ground 2021-04-08 23:58:11 +04:00
jordan4ibanez
668b67158c merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
c259fc2a28 Add in all biome information to mobs 2021-04-08 23:58:11 +04:00
jordan4ibanez
249a3c8891 Add bats, chicken, and blaze spawn info 2021-04-08 23:58:11 +04:00
jordan4ibanez
34b66acc9d Make reference list copy-pastable 2021-04-08 23:58:11 +04:00
jordan4ibanez
89f35c06af Ignore default or void dimensions 2021-04-08 23:58:11 +04:00
jordan4ibanez
cb093b774c Add biome list 2021-04-08 23:58:10 +04:00
jordan4ibanez
abc68f4dc6 Refactor spawning into it's own file 2021-04-08 23:58:10 +04:00
jordan4ibanez
38dcbcb3d4 Fix mobs colliding with other mobs/players 2021-04-08 23:58:10 +04:00
jordan4ibanez
d65a5e3be0 Fix mobs colliding with objects 2021-04-08 23:58:10 +04:00
kay27
de41a4c26b merge 2021-04-08 23:58:10 +04:00
kay27
5e0bd2281c Revert "Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master""
This reverts commit 6a1a634cba4e0530a4cb72cf319f203f4a770d7f.
2021-04-08 23:58:10 +04:00
jordan4ibanez
18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00
jordan4ibanez
b9d175e6a5 Add erlehmann fix to redstone world border crash 2021-04-08 15:16:38 -04:00
jordan4ibanez
0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
iliekprogrammar
d50665d2d5 Allow kelp stems at half height to be treated like full-sized ones.
Remove debug information
2021-04-08 19:25:19 +08:00
iliekprogrammar
5ccb12586d Fix bug where incorrect number of items are dropped. 2021-04-08 13:35:49 +08:00
iliekprogrammar
2db0e176b3 Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 12:46:04 +08:00
kay27
8e30bc8dbd [mcl_portals] Prevent from spawning Nether portals in Undertale when not enough air space in Nether 2021-04-08 02:54:33 +04:00
Elias Fleckenstein
d77affca91 Change max_bossbars default to 4 2021-04-07 17:39:13 +02:00
Elias Fleckenstein
6a1a634cba Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master"
This reverts commit 4f2a6b2db001b98abd99e32e531aedc243118161, reversing
changes made to 0970981252e32901b18ce00fa7498507818c0245.
2021-04-07 17:20:56 +02:00
Elias Fleckenstein
6c35ff1fc5 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 17:02:46 +02:00
Elias Fleckenstein
567f157541 Add a bossbar limit setting 2021-04-07 17:02:03 +02:00
Elias Fleckenstein
f282cd0c4d Allow bossbars to be grouped 2021-04-07 16:56:21 +02:00
Elias Fleckenstein
3449b3eb7c Improve bossbars API 2021-04-07 16:47:14 +02:00
iliekprogrammar
986ae950ec Merge remote-tracking branch 'upstream/master' 2021-04-07 22:30:44 +08:00
iliekprogrammar
61cef21cd1 Add right-to-left statbars, for hunger and air. 2021-04-07 22:26:42 +08:00
TechDudie
db9e8d23d9 Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
TechDudie
f664a87dac Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
Elias Fleckenstein
6e2a7c8a7e Make gateway enderpearl teleports easier 2021-04-07 13:47:48 +02:00
Elias Fleckenstein
c451866a36 Fix #1426 2021-04-07 09:56:00 +02:00
Elias Fleckenstein
3c1a38904a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 09:25:44 +02:00
Elias Fleckenstein
b2c09c8ba0 Add gateway portals 2021-04-07 09:17:13 +02:00
jordan4ibanez
4f2a6b2db0 Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1487
2021-04-07 06:40:21 +00:00
jordan4ibanez
ec6eb51726 Massively overhaul spawning algorithm for mobs 2021-04-07 02:39:15 -04:00
jordan4ibanez
6cdf7c98c2 Rework all mobs spawning - preprototype stage 2021-04-07 00:55:57 -04:00
jordan4ibanez
0970981252 Merge pull request 'Adjust enderman projectile behavior, add snowballs to avoidance' (#1485) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1485
2021-04-07 02:22:44 +00:00
jordan4ibanez
6c4c22e3b9 Adjust enderman projectile behavior, add snowballs to avoidance 2021-04-06 22:22:05 -04:00
jordan4ibanez
9b1cc19718 Merge pull request 'Make mobs not collide with objects to stop weird glitches' (#1484) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1484
2021-04-07 02:08:39 +00:00
jordan4ibanez
7cecc71b91 Make mobs not collide with objects to stop weird glitches 2021-04-06 22:08:10 -04:00
jordan4ibanez
da057ee9e8 Merge pull request 'Increase unmounting force' (#1483) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1483
2021-04-07 02:03:25 +00:00
jordan4ibanez
6aaf25bbc9 Increase unmounting force 2021-04-06 22:02:52 -04:00
jordan4ibanez
7826311175 Merge pull request 'Make unmounting a mob less of a jolt' (#1482) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1482
2021-04-07 02:00:32 +00:00
jordan4ibanez
4a1faa44de Make unmounting a mob less of a jolt 2021-04-06 21:59:51 -04:00
jordan4ibanez
8ab9de74dc Merge pull request 'Add line of sight calculations to the enderman' (#1481) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1481
2021-04-07 01:30:19 +00:00
jordan4ibanez
acd2b8e691 Add line of sight calculations to the enderman 2021-04-06 21:29:52 -04:00
jordan4ibanez
21334bc49d Merge pull request 'Massive enderman sight check calculation overhaul' (#1480) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1480
2021-04-07 01:15:40 +00:00
jordan4ibanez
56f94af6ce Massively overhaul enderman sight calculations 2021-04-06 21:13:20 -04:00
jordan4ibanez
9f7899c01a Enderman use vectors to check distance between player and self 2021-04-06 20:37:48 -04:00
jordan4ibanez
4ec3fd0ba6 Merge pull request 'Fix insane enderman 64 node radius check for players' (#1479) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1479
2021-04-07 00:25:52 +00:00
jordan4ibanez
00db03320b Fix insane enderman 64 node radius check for players 2021-04-06 20:24:46 -04:00
kay27
069e089ae4 [mcl_portals, mcl_structures] Add End gateways W-I-P by Elias Fleckenstein with minor portals improvements and fixes 2021-04-07 03:34:15 +04:00
Elias Fleckenstein
430f958fae Move end exit portal to 0, 0; Add end gateway portals (WIP) 2021-04-06 20:08:20 +02:00
Elias Fleckenstein
f65c40f805 Make dragon egg teleport on punching 2021-04-06 17:20:11 +02:00
Doloment
51f121d516 Merge branch 'master' into ender_chest_fix 2021-04-06 14:57:19 +00:00
jordan4ibanez
9e1b662c03 Merge pull request 'Remove 47 node object check from mobs' (#1473) from jordan4ibanez/MineClone2-MobTweaks:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1473
2021-04-06 14:41:03 +00:00
jordan4ibanez
8e2493dd9a Remove 47 node object check from mobs 2021-04-06 10:40:16 -04:00
Elias Fleckenstein
89a9b16465 Merge pull request 'Add End Credits' (#1469) from credits into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1469
2021-04-06 14:39:47 +00:00
Elias Fleckenstein
ea08fee9ba Make the dragon stay within a 50 blocks range of the portal 2021-04-06 16:38:23 +02:00
Doloment
1e17989ef2 Prevent opening an ender chest while block above it 2021-04-06 21:17:02 +07:00
Elias Fleckenstein
3c73ad3b98 Add ztianyang to credits 2021-04-06 16:06:44 +02:00
Elias Fleckenstein
91e2372df0 Merge branch 'master' into credits 2021-04-06 16:06:12 +02:00
Elias Fleckenstein
058c6ef9f4 Merge pull request 'Fix chest entity textures' (#1472) from Doloment/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1472
2021-04-06 14:03:30 +00:00
Elias Fleckenstein
38a12e59da Fix comment indentation in wieldview 2021-04-06 16:02:18 +02:00
Elias Fleckenstein
1d587b8895 Fix crash in wieldview 2021-04-06 15:59:59 +02:00
Elias Fleckenstein
83b9cf3ad2 End exit portal openng / closing on dragon death / spawn 2021-04-06 15:48:17 +02:00
Doloment
31a7a4fbb6 Merge branch 'master' into master 2021-04-06 13:42:07 +00:00
Elias Fleckenstein
962a13847e Fix dragons summoned using commands spawning an egg on the exit portal 2021-04-06 14:57:29 +02:00
Elias Fleckenstein
f350fa6272 Add bossbars 2021-04-06 14:50:34 +02:00
Doloment
055c406d7a Fix chest entity textures (trapped chests were lighter) 2021-04-06 18:57:06 +07:00
Elias Fleckenstein
a348909ba3 Enderdragon: Proper Egg and XP spawning 2021-04-06 12:50:36 +02:00
Elias Fleckenstein
5bdb3bc274 Add MineClone5 section to credits 2021-04-06 12:14:43 +02:00
Elias Fleckenstein
ba15f01ca9 Add translations; Duplicate listing of people 2021-04-06 12:08:25 +02:00
Elias Fleckenstein
c93a865098 Remove empty line from mcl_portals 2021-04-06 11:59:22 +02:00
Elias Fleckenstein
d07e415b37 Add credits screen 2021-04-06 11:55:21 +02:00
Elias Fleckenstein
175cb44fb1 Merge branch 'master' into credits 2021-04-06 10:53:15 +02:00
AFCMS
91da727184 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-05 15:22:57 +02:00
AFCMS
339e3e2792 fix some tools not using right var 2021-04-05 14:32:48 +02:00
kay27
beb2484224 Merge https://git.minetest.land/MineClone2/MineClone2/pulls/1366 2021-04-05 13:50:26 +04: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
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
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