1
0
Fork 0
Commit Graph

6434 Commits (cca03bcbd25a58e8946f50d72bf7443d5b2a4261)

Author SHA1 Message Date
jordan4ibanez d04e694d1a Merge pull request 'Stop dead mobs from getting in the way of fighting other mobs' (#1623) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1623
2021-04-23 20:35:52 +00:00
jordan4ibanez 36d5af1d15 Stop dead mobs from getting in the way of fighting other mobs 2021-04-23 16:35:16 -04:00
jordan4ibanez db0e3a389d Merge pull request 'Two fixes to mobs' (#1622) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1622
2021-04-23 20:31:48 +00:00
jordan4ibanez 73b4d3c1d2 stop projectile mobs from being completely disabled while stunned 2021-04-23 16:31:13 -04:00
jordan4ibanez eb7ae5e10e Fix random crash 2021-04-23 16:28:30 -04:00
jordan4ibanez 43fdc08030 Merge pull request 'Add new mob hit sounds' (#1621) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1621
2021-04-23 20:23:09 +00:00
jordan4ibanez c831da2c02 Fix mobs not making hit sound when hit by node 2021-04-23 16:22:34 -04:00
jordan4ibanez d5a38fef58 Add in new mob punched sounds 2021-04-23 16:19:37 -04:00
jordan4ibanez 8ea546abfb Merge pull request 'Overhaul horse' (#1620) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1620
2021-04-23 20:04:44 +00:00
jordan4ibanez 8e7ce5a72a Add in a visual for horse taming (hearts) 2021-04-23 16:04:01 -04:00
jordan4ibanez 189c0ad157 Half finish horse (riding logic, etc) 2021-04-23 15:53:01 -04:00
jordan4ibanez 53fb683d33 Merge pull request 'Fix llama blaze and ghast projectile sprites' (#1619) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1619
2021-04-23 18:51:05 +00:00
jordan4ibanez f64f8e31e3 Fix llama blaze and ghast projectile sprites 2021-04-23 14:50:38 -04:00
jordan4ibanez 7faf2460b7 Merge pull request 'Fixes to mobs' (#1618) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1618
2021-04-23 18:50:10 +00:00
jordan4ibanez 58bee2a2dd Fix projectile tails clipping through sprite 2021-04-23 14:43:00 -04:00
jordan4ibanez 16cc7e37d2 Randomize projectile cooldown timer 2021-04-23 14:34:59 -04:00
jordan4ibanez 8eb9ba12ce Fix crash when mob collides with nil entity 2021-04-23 14:33:40 -04:00
jordan4ibanez d231edbb43 Merge pull request 'Massive overhaul to projectile mobs with custom projectile function, make llamas spit' (#1617) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1617
2021-04-23 18:10:52 +00:00
jordan4ibanez 5d59583583 Massive overhaul to projectile mobs with custom projectile function, make llamas spit 2021-04-23 14:10:12 -04:00
jordan4ibanez adeea8ed43 Merge pull request 'Fix enderman' (#1616) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1616
2021-04-23 17:36:16 +00:00
jordan4ibanez f6fa90096d Fix enderman teleport attack 2021-04-23 13:35:30 -04:00
jordan4ibanez 4fb9e69e41 Make enderman become hostile when stared at, freeze when attacking when stared at 2021-04-23 13:27:17 -04:00
jordan4ibanez 99f13f84b5 Half-fix enderman 2021-04-23 13:13:23 -04:00
jordan4ibanez 3788886518 Merge pull request 'Fix wolves and make chickens slow fall' (#1614) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1614
2021-04-23 17:07:11 +00:00
jordan4ibanez dd76b15c50 Make ghasts not insta-kill 2021-04-23 13:06:57 -04:00
jordan4ibanez b6f19699e9 Make enderdragon half work 2021-04-23 13:06:17 -04:00
jordan4ibanez 4efec1ef58 Add in chicken slow falling 2021-04-23 12:55:11 -04:00
Elias Fleckenstein 988a44148e Merge branch 'master' into mineclone5 2021-04-23 18:11:41 +02:00
Elias Åström 73cd482e55 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 16:30:56 +02:00
NO11 ef86eb0779 Fix wrong sweet berry item path 2021-04-23 14:18:31 +00:00
AFCMS 414adff8fb Fix bad API documentation od mcl_death_drop 2021-04-23 13:59:37 +00:00
Elias Åström 7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Elias Fleckenstein a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Elias Fleckenstein 99ee5f05d3 Merge branch 'mineclone5' into netherite 2021-04-23 13:43:27 +02:00
Elias Fleckenstein f80eb5633b Merge branch 'master' into mineclone5 2021-04-23 13:43:12 +02:00
Elias Fleckenstein 62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Elias Fleckenstein a836ac9879 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 13:42:47 +02:00
Elias Fleckenstein 827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Elias Fleckenstein 78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Elias Fleckenstein 50b6f03977 Integrate no fall damage in water & end portal 2021-04-23 12:34:24 +02:00
Elias Fleckenstein 818f33ff74 Merge branch 'master' into damage 2021-04-23 10:16:58 +02:00
Sven792 038066f0c5 Mirrored foodbar icons to fit the right-to-left change 2021-04-23 09:52:09 +02:00
jordan4ibanez 0895666407 Fix random crash with mixed mob ally data types 2021-04-22 23:36:58 -04:00
jordan4ibanez 408296140a Fix and overhaul wolves 2021-04-22 23:30:32 -04:00
jordan4ibanez aac1e19336 Implement rotation locking when standing, fix rotation unlock/lock for fly/swim mobs 2021-04-22 23:18:33 -04:00
jordan4ibanez fa059b5df2 Fix ghast's eyeheight 2021-04-22 22:59:03 -04:00
jordan4ibanez 2e3e92e393 Fix ghast's insane difficulty 2021-04-22 22:58:32 -04:00
jordan4ibanez 11bcf3aa34 Add attributes to epCode 2021-04-22 22:51:13 -04:00
jordan4ibanez 2099be43ea Update to epCode's fixed version of ghast model 2021-04-22 22:50:14 -04:00
jordan4ibanez 5037ec3736 Fix ghasts horrible collisionbox 2021-04-22 22:40:16 -04:00
jordan4ibanez 0a8fff6524 Add in mob criticals when falling 2021-04-22 22:08:54 -04:00
jordan4ibanez afdcada1fd Fix endermite 2021-04-22 21:46:13 -04:00
jordan4ibanez 5d876725c5 Fix bats 2021-04-22 21:45:00 -04:00
jordan4ibanez ef0d52a2df Update backup_code_api.lua 2021-04-22 21:41:54 -04:00
jordan4ibanez 8142f7e512 Add in mob death 2021-04-22 21:36:42 -04:00
jordan4ibanez ebf27866ca Fix typo and error in animation.lua 2021-04-22 21:12:08 -04:00
jordan4ibanez 3fe8d2d3c5 Add file death_logic.lua 2021-04-22 20:30:50 -04:00
jordan4ibanez b73ab976a1 Implement framework for mob death 2021-04-22 20:25:58 -04:00
jordan4ibanez 8530e6ee36 Make mob punching time based 2021-04-22 20:20:56 -04:00
jordan4ibanez e1812b2cdb Reset pause timer to 0 2021-04-22 20:12:02 -04:00
jordan4ibanez 991bba0a1d Add comments into ai.lua 2021-04-22 20:10:01 -04:00
jordan4ibanez f9a7144b65 Implement ability to hurt mobs 2021-04-22 20:07:30 -04:00
jordan4ibanez 45790c0be0 Re-enable mob punching (broken) 2021-04-22 19:12:02 -04:00
jordan4ibanez 31a791c33b Undo debug.txt spam from mob spawning 2021-04-22 18:20:58 -04:00
jordan4ibanez d0d128c1d8 Break infinite loop if unable to find any mob to spawn 2021-04-22 18:18:57 -04:00
jordan4ibanez 1fc15e92fe Merge branch 'mineclone5' into mineclone5 2021-04-22 21:57:21 +00:00
jordan4ibanez ee905642c2 Add temporary warning debug to spawning algorithm output 2021-04-22 17:56:38 -04:00
NO11 c46c07f836 Makes fireworks rockets infinite in creative mode 2021-04-22 19:18:05 +00:00
kay27 0486c7c468 [mineclone5] fix sweeet berry depends 2021-04-22 23:07:56 +04:00
epCode 62adbb9625 Fix #1587 2021-04-22 10:39:21 -07:00
Code-Sploit d12b192785 Add forgotten textures for netherite ingot, scrap and ancient debris 2021-04-22 14:38:17 +00:00
Code-Sploit 4baea9f420 Add all pixel-perfection textures for netherite 2021-04-22 13:59:53 +00:00
Code-Sploit 0147da7270 Add unofficial MC-textures (credits to NO11) 2021-04-22 13:38:00 +00:00
Code-Sploit 24cc4318e2 Add crafting recipe for smithing table 2021-04-22 12:11:47 +00:00
Code-Sploit 498b1c792a Fix not able to put diamond tools in the smithing_table 2021-04-22 12:07:30 +00:00
Elias Fleckenstein f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +02:00
Elias Fleckenstein 222104b3cb Integrate dispensers 2021-04-22 13:51:36 +02:00
Elias Fleckenstein 9f7b371bfc Merge branch 'master' into damage 2021-04-22 13:29:32 +02:00
Elias Fleckenstein 8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00
Elias Fleckenstein 951a24c684 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:22:20 +02:00
Elias Fleckenstein acbdc937b4 Fix crash when trying to explode an unknown node 2021-04-22 13:19:44 +02:00
Elias Fleckenstein 87dc41a125 Fix crash when trying to explode an unknown node 2021-04-22 13:19:26 +02:00
jordan4ibanez 2cef9e7cca Optimize mob spawning even further with additional lua locals 2021-04-22 00:39:32 -04:00
jordan4ibanez edb1939649 Fix mob_counter in mob spawning limiter 2021-04-22 00:27:35 -04:00
jordan4ibanez 7c1adeab45 Hyper-optimize mob spawning 2021-04-22 00:20:57 -04:00
jordan4ibanez ecebe0253c Merge branch 'mineclone5' into mineclone5 2021-04-22 03:29:18 +00:00
jordan4ibanez fbe3ccc5c0 Delete current state of things comment 2021-04-21 23:28:38 -04:00
jordan4ibanez e398aca747 Merge pull request 'Fix sheep and pig rotation' (#1592) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1592
2021-04-22 03:26:27 +00:00
jordan4ibanez 5e15af260b Fix pig rotation 2021-04-21 23:25:19 -04:00
jordan4ibanez 6aa6364492 Fix sheep rotation 2021-04-21 23:25:10 -04:00
kay27 7c2ea8d7f0 [mineclone5] Merge backup_code_api.lua from latest mineclone5 and playerplus from master 2021-04-22 01:16:22 +04:00
jordan4ibanez 29305f548d Overhaul arrow register, implement basic blaze, break parts of arrow register for now, remove fallback for detecting players 2021-04-21 15:08:35 -04:00
jordan4ibanez 08c90c34e8 Make parrots and squids work with tilt fly/swim 2021-04-21 13:05:46 -04:00
jordan4ibanez 91099c3be9 Fix auto-true statement for tilt fly/swim 2021-04-21 13:01:14 -04:00
jordan4ibanez 71c34823bc Make tilt flying/swimming dynamic 2021-04-21 12:56:36 -04:00
jordan4ibanez 20886f54bb Make shooty mobs jump 2021-04-21 12:48:23 -04:00
jordan4ibanez ebd995fbd2 Simplify skeleton arrow damage calculation 2021-04-21 12:45:02 -04:00
jordan4ibanez c9f71d66f5 Implement skeletons/strays 2021-04-21 12:42:34 -04:00
jordan4ibanez 99e808296b Add missing skeleton/stray run animation 2021-04-21 12:17:51 -04:00
jordan4ibanez 74094938bb Fix crash with non-punch attack mobs in collision 2021-04-21 12:10:29 -04:00
jordan4ibanez 6bd279255c Fully implement zombie pigmen 2021-04-21 11:50:22 -04:00
jordan4ibanez 964ce9ccf7 Temporarily disable spawn eggs from setting owner 2021-04-21 11:42:01 -04:00
jordan4ibanez 5062d56a5d Implement neutral mob mechanics and partial implement of zombie pigmen 2021-04-21 11:00:02 -04:00
jordan4ibanez b0b1ec9436 Implement zombie pigmen and make them turn hostile when punched 2021-04-21 10:53:20 -04:00
jordan4ibanez f1dc286442 Dump mob_punch from backup_code_api.lua back into interaction.lua 2021-04-21 10:23:51 -04:00
jordan4ibanez cc2a0ae52c Complete charged creeper 2021-04-21 10:21:11 -04:00
jordan4ibanez 486959515c Make creepers even more dangerous 2021-04-21 10:20:31 -04:00
Elias Fleckenstein 74a3b2654f Create inventory if not present in mcl_armor.equip 2021-04-21 13:28:22 +02:00
Elias Fleckenstein dccb71e2fb Fix view_range_factors warning 2021-04-21 11:34:22 +02:00
Elias Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias Fleckenstein a0a6eaee48 Merge branch 'master' into mineclone5 2021-04-21 11:32:32 +02:00
Elias Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
Elias Fleckenstein f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00
Elias Fleckenstein bec86ece0b Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5 2021-04-21 11:31:29 +02:00
jordan4ibanez 576621169b Make creepers and zombies even harder 2021-04-20 23:26:18 -04:00
jordan4ibanez 2c87bd19f3 Overhaul zombie villager 2021-04-20 23:14:53 -04:00
jordan4ibanez 1ed3377559 Add punch mobs knockback to players when hit 2021-04-20 23:11:18 -04:00
jordan4ibanez 8c9356a18c Implement eye_height and viewing range for hostile mobs, along with making punchy mobs jump over nodes 2021-04-20 22:58:39 -04:00
jordan4ibanez a05ebd7cc2 Add informative text art 2021-04-20 22:44:34 -04:00
jordan4ibanez 60ac3058ce Make zombies more difficult 2021-04-20 22:42:51 -04:00
jordan4ibanez 751c4c2d99 Integrate mob punching into collision detection 2021-04-20 22:41:13 -04:00
jordan4ibanez 6b52b94516 Start setting up hostile punch attack type 2021-04-20 22:30:34 -04:00
jordan4ibanez d371d6fdc9 Adjust creeper explosion settings 2021-04-20 22:04:54 -04:00
jordan4ibanez fabd4d64e6 Slow down creeper type mobs explosion buildup 2021-04-20 21:35:19 -04:00
jordan4ibanez bf367fffd0 Add in sound_handling and make explosion type mobs make their attack sound before explosion animation 2021-04-20 21:34:18 -04:00
jordan4ibanez 0b763f54b5 Finish creeper movement ai and move jump_check into environment 2021-04-20 21:00:36 -04:00
jordan4ibanez cd6f07537f Make creepers even more deadly 2021-04-20 20:43:45 -04:00
jordan4ibanez 9678b556e1 Fix crashes when trying to collision detect a removed mob 2021-04-20 20:33:30 -04:00
jordan4ibanez cdb840609d Add in creeper basic prototype 2021-04-20 20:19:55 -04:00
jordan4ibanez 008d670ed9 Remove wandering from ai 2021-04-20 17:10:51 -04:00
jordan4ibanez 491ef6c8f8 Add in auto mob removal if something goes horribly wrong 2021-04-20 16:48:20 -04:00
jordan4ibanez 348df0fcec Rename detect_players_in_area to detect_closest_player_within_radius 2021-04-20 16:46:10 -04:00
jordan4ibanez ac08c6991c Add in detect_players_in_area 2021-04-20 16:39:05 -04:00
kay27 1e5ae0bbac [mcl_beds] Fix screwdriver/bed duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149 2021-04-21 00:36:07 +04:00
jordan4ibanez 3d776138e9 Start implementing creeper ai 2021-04-20 14:55:22 -04:00
kay27 106ecb0958 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-20 22:08:36 +04:00
TechDudie 1db8c21ec2 Emergency 2021-04-20 17:57:07 +00:00
Elias Fleckenstein 6b005a9214 Fix missing texture warning 2021-04-20 19:31:42 +02:00
Elias Fleckenstein 0c9314fba7 Use different textures for blackstone top and side 2021-04-20 19:28:35 +02:00
epCode c7d91baadf rid some mobs of bouncing animation 2021-04-19 14:29:12 -07:00
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
TechDudie feda530bff Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:39:09 +00:00
TechDudie 5d98662a60 Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:32:47 +00:00
TechDudie cea1078a16 Upload files to 'mods/ITEMS/mcl_sweet_berry/textures' 2021-04-19 18:30:44 +00:00
TechDudie d347b829c0 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_2.png' 2021-04-19 18:30:11 +00:00
TechDudie ade55cee33 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_3.png' 2021-04-19 18:29:57 +00:00
TechDudie 9efefc2d85 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_1.png' 2021-04-19 18:28:33 +00:00
TechDudie 85e693e1e1 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_0.png' 2021-04-19 18:28:16 +00:00
TechDudie 32c773cdea Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry.png' 2021-04-19 18:28:01 +00:00
TechDudie 49f8df85ee Upload files to 'mods/ITEMS/mcl_sweet_berry' 2021-04-19 18:26:59 +00:00
TechDudie b012c3b739 Add 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:20:44 +00:00
TechDudie f517d82885 Add 'mods/ITEMS/mcl_sweet_berry/mod.conf' 2021-04-19 18:11:48 +00:00
Elias Fleckenstein 4c25091430 Fix syntax error in mcl_inventory 2021-04-19 19:12:32 +02:00
Elias Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
NO11 7a5ce1c717 Simplify debarking again 2021-04-19 16:53:48 +00:00
NO11 e8c15867ad Add mcl_stripped_varient node def 2021-04-19 16:50:21 +00:00
Elias Fleckenstein 20a4e038f5 Fix crash when slain by named mob 2021-04-19 17:40:50 +02:00
Elias Fleckenstein c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Elias Fleckenstein 7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
2021-04-19 15:16:59 +02:00
Elias Fleckenstein d8d4cb5def Revert color changes to GUI.
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
2021-04-19 14:44:20 +02:00
Elias Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Elias Fleckenstein 1bf9455065 Merge branch 'master' into mineclone5 2021-04-19 11:12:21 +02:00
Elias Fleckenstein 52a49e640e Merge branch 'master' into damage 2021-04-19 09:57:56 +02:00
Elias Fleckenstein 69485f8505 Integrate falling nodes damage 2021-04-19 09:49:29 +02:00
NO11 0c5ca70187 remove wrong config 2021-04-19 07:35:53 +00:00
Elias Fleckenstein ec1ef1affa Merge pull request 'Fix #1422' (#1474) from Doloment/MineClone2:ender_chest_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1474
2021-04-19 07:25:57 +00:00
kay27 e2d3f2a194 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-19 09:58:55 +04:00
jordan4ibanez c03717139b Add mod.conf to mcl_fireworks 2021-04-18 23:23:07 -04:00
jordan4ibanez 44a25de12f Fix crashing with unknown slot description when enchanting 2021-04-18 23:18:18 -04:00
jordan4ibanez 85e531bf10 Remove unneeded mobs:protect from code 2021-04-18 21:24:31 -04:00
jordan4ibanez 4d589dfb2a Remove literally unneeded mobs:capture_mob 2021-04-18 21:22:39 -04:00
jordan4ibanez 39985aa558 Up fallback max xp to 3 2021-04-18 21:22:21 -04:00
jordan4ibanez 1920ddf915 Change all enemy attack info to more workable and understandable attacks 2021-04-18 21:02:03 -04:00
kay27 96694692d8 [mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master 2021-04-19 00:15:20 +04:00
NO11 aa533edda2 Simplify debarking 2021-04-18 18:28:39 +00:00
Elias Fleckenstein c9b4ddb923 Add command damage type (This is Non-MC) 2021-04-18 20:22:18 +02:00
Elias Fleckenstein 53b0ad7347 Implement magic damage 2021-04-18 20:21:11 +02:00
Elias Fleckenstein d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02:00
NO11 49f6ccaa4a Remove old crafting recipes 2021-04-18 18:02:41 +00:00
NO11 3668b2dee6 Summarize all debarked types of wood 2021-04-18 18:02:37 +00:00
Elias Fleckenstein a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
Elias Fleckenstein d08a226a51 Integrate critical hits 2021-04-18 19:50:48 +02:00
NO11 9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Elias Fleckenstein 2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Elias Fleckenstein 3ad5b30ea5 Add cramming and fireworks damage types for future use 2021-04-18 17:38:19 +02:00
Elias Fleckenstein 1cf53caa7a Update armor stand entity in on_activate callback, remove debug print 2021-04-18 16:20:32 +02:00
Elias Fleckenstein d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Elias Fleckenstein 4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Elias Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
Elias Fleckenstein 5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +02:00
Doloment 956dab78ce Added LBM 2021-04-18 09:50:02 +00:00
Elias Åström fc9928c0b6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 11:42:38 +02:00
Elias Åström 573b1dc44b Do not include unnecessary tool_capabilities
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata.  It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:

(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition

The first case covers situations like having a pickaxe only being
enchanted with silk_touch.  The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 11:40:43 +02:00
Elias Åström dd69dcfd9f Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-18 11:40:13 +02:00
Elias Fleckenstein 76271199c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 08:39:04 +02:00
kay27 bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
kay27 11b66e83a2 [mcl_portals] Better NP search, no more teleports on the roof, fix https://git.minetest.land/MineClone2/MineClone2/issues/1560 2021-04-18 04:29:30 +04:00
AFCMS 4aa6421faf performance optimisation 2021-04-18 00:27:51 +02:00
jordan4ibanez 719bb2a3c9 Add in prototype jump-only mobs api 2021-04-17 18:21:33 -04:00
AFCMS f967aa3d51 remove unuseful code 2021-04-18 00:10:11 +02:00