Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
6,383 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

5971 Commits (97e69e04aacd6a1f93e585d7ff20be6babed435a)

Author SHA1 Message Date
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
Elias Fleckenstein 5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +02:00
AFCMS 2d6e0241cd Merge branch 'master' into luacheck 2021-04-16 11:03:46 +02:00
AFCMS 1df916bd7b fix warning 2021-04-16 11:03:31 +02:00
jordan4ibanez 044e9d22ad Re-enable mob-despawner 2021-04-15 21:13:19 -04:00
epCode 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
epCode cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
AFCMS 60e74fc41d fix excedent lines 2021-04-15 23:44:29 +02:00
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
epCode 9feaec95d9 Fix Stupid mistake with zombievillagers 2021-04-15 14:29:24 -07:00
epCode 0ca6c06198 add the other villager zombie textures 2021-04-15 14:11:35 -07:00
AFCMS b497778192 delete unused file 2021-04-15 22:22:39 +02:00
epCode f0fab4e708 Allow zombie villager to have visual armor 2021-04-15 12:04:25 -07:00
Elias Fleckenstein 0c5096db13 Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1564
 2021-04-15 16:18:51 +00:00
NO11 a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
NO11 bbffda3635 Make cactus destroy items 2021-04-15 11:21:15 +00:00
Nils Dagsson Moskopp 2575e20e7e Show preview of new banner pattern when crafting it 2021-04-15 13:25:59 +04:00
epCode 5fe30d7287 Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-14 16:51:17 -07:00
Benjamin Schötz bffd032a8b Fixes my own typo ;) 2021-04-14 22:06:03 +02:00
Benjamin Schötz e4c8ba795a Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-14 22:03:36 +02:00
Elias Fleckenstein 8931ffb7d3 Fix crash with armor enchantments 2021-04-14 20:39:35 +02:00
Elias Fleckenstein 727d7be6ab Call on_equip and on_unequip everytime needed 2021-04-14 20:39:05 +02:00
Elias Fleckenstein ec6d68322a Make hbarmor work 2021-04-14 20:08:08 +02:00
epCode 18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Elias Fleckenstein 9c75cd1a79 Implement starve damage 2021-04-14 19:09:46 +02:00
Elias Fleckenstein a3af1cdf6e Implement in_wall damage type 2021-04-14 19:07:58 +02:00
Elias Fleckenstein 4e37cc114c Implement out_of_world damage type 2021-04-14 19:06:30 +02:00
Elias Fleckenstein 5d9bb7cacd Fix armor not actually protecting lol 2021-04-14 19:06:11 +02:00
Elias Fleckenstein 49e7def70a Implement lightning_bolt damage reason 2021-04-14 18:40:41 +02:00
Elias Fleckenstein ad3defdfb3 Merge branch 'master' into damage 2021-04-14 18:29:42 +02:00
Elias Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Elias Fleckenstein 875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
j1233 46b1762872 credit me 
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
 2021-04-14 14:53:33 +00:00
Elias Fleckenstein 963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Elias Fleckenstein 6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
Elias Fleckenstein e74838136d Use cactus damage type 2021-04-14 16:27:21 +02:00
Elias Fleckenstein d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Elias Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
epCode 5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
epCode 8d22102c66 remove abitrary minetest.chat_send_all( 2021-04-13 16:28:38 -07:00
epCode a93562a60c Merge pull request 'Add Firework Rocket for elytra boost' (#1551) from NO11/MineClone2:elytra_rocket into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1551
 2021-04-13 23:27:23 +00:00
epCode 399ed85717 Make flying w elytra use pitch and not sneak 2021-04-13 16:14:37 -07:00
jordan4ibanez 67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00
NO11 1c50f9aed6 fix typo 2021-04-13 20:52:55 +00:00
NO11 f768972469 add rocket texture (pixel perfection) 2021-04-13 20:38:00 +00:00
NO11 9c68528b8b add german translation 2021-04-13 20:36:41 +00:00
NO11 1597e093b5 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-13 20:35:40 +00:00
NO11 f15a28109c add rocket for elytra boost 2021-04-13 20:33:34 +00:00
epCode f498d3ae02 make elytra activate mor MC-like 2021-04-13 11:45:31 -07:00
Code-Sploit cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27 3077498a63 Fix screwdriver/door duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149 2021-04-13 16:49:10 +04:00
Code-Sploit 84764389dc Fix #1538 2021-04-13 11:34:53 +00:00
Elias Fleckenstein 78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
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 615b15f133.
 2021-04-12 16:36:08 +02:00
Elias Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Elias Fleckenstein c3868084af Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 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 7a8079bb64, reversing
changes made to 849823af1f.
 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 c1e295de5f.
 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 ea41c82834.
 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 f5f6e232cc.
 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 0842a36aa6.
 2021-04-09 01:32:58 +04:00
kay27 26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash" 
This reverts commit b9d175e6a5.
 2021-04-09 01:32:27 +04:00
kay27 6b31e85385 Revert (1/3) "Revert fixes to crash world border" 
This reverts commit 18f73ba31f.
 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 6a1a634cba.
 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 4f2a6b2db0, reversing
changes made to 0970981252.
 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