1
0
Fork 0
Commit Graph

6598 Commits

Author SHA1 Message Date
Lizzy Fleckenstein f80eb5633b Merge branch 'master' into mineclone5 2021-04-23 13:43:12 +02:00
Lizzy Fleckenstein a836ac9879 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 13:42:47 +02:00
Lizzy Fleckenstein 827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Elias Fleckenstein 3669ccf907 Merge pull request 'Mirrored foodbar icons to fit the right-to-left change' (#1607) from Sven792/MineClone2:foodbar-icon into master
Reviewed-on: MineClone2/MineClone2#1607
2021-04-23 08:20:13 +00:00
Sven792 038066f0c5 Mirrored foodbar icons to fit the right-to-left change 2021-04-23 09:52:09 +02:00
jordan4ibanez cff9dcd622 Merge pull request 'Fix ghast's insane difficulty, rotation, and eyeheight' (#1606) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1606
2021-04-23 03:00:01 +00: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 704e313d5d Merge pull request 'Add in criticals, and fix/overhaul ghasts, add in epCode's fixed ghast model' (#1605) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1605
2021-04-23 02:53:19 +00:00
jordan4ibanez 5bf0b747cf Merge branch 'mineclone5' into mineclone5 2021-04-23 02:53:00 +00: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 f00652f050 Merge pull request 'Fix endermite and bats' (#1604) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1604
2021-04-23 01:46:55 +00: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 53d3de7dd3 Merge pull request 'Add ability to fight and kill mobs' (#1603) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1603
2021-04-23 01:38:12 +00: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 6b93978a22 Merge pull request 'Break infinite loop if unable to find any mob to spawn' (#1602) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1602
2021-04-22 22:21:07 +00: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 20abb4e864 Merge pull request 'Add temporary warning debug to spawning algorithm output' (#1601) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1601
2021-04-22 21:57:41 +00: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
Lizzy Fleckenstein 34f612c3ea Merge branch 'master' into mineclone5 2021-04-22 13:24:27 +02:00
Lizzy Fleckenstein 8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00
Lizzy Fleckenstein 951a24c684 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:22:20 +02:00
Lizzy Fleckenstein 6c11bc427a Merge branch 'master' into mineclone5 2021-04-22 13:19:59 +02:00
Lizzy Fleckenstein acbdc937b4 Fix crash when trying to explode an unknown node 2021-04-22 13:19:44 +02:00
Lizzy Fleckenstein 87dc41a125 Fix crash when trying to explode an unknown node 2021-04-22 13:19:26 +02:00
jordan4ibanez 052660e58a Merge pull request 'Optimize mob spawning even further with additional lua locals' (#1595) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1595
2021-04-22 04:40:22 +00:00
jordan4ibanez 2cef9e7cca Optimize mob spawning even further with additional lua locals 2021-04-22 00:39:32 -04:00
jordan4ibanez 81e75c8908 Merge pull request 'Hyper optimize mob spawning and fix global mob check for mob spawner limiter' (#1594) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1594
2021-04-22 04:32:21 +00: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 aeaaeea141 Merge pull request 'Delete current state of things comment' (#1593) from jordan4ibanez/MineClone2:mineclone5 into mineclone5
Reviewed-on: MineClone2/MineClone2#1593
2021-04-22 03:30:32 +00:00
jordan4ibanez ecebe0253c Merge branch 'mineclone5' into mineclone5 2021-04-22 03:29:18 +00:00