Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-14 23:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,356 Commits 107 Branches 83 Tags 166 MiB
f84bdbd777
Commit Graph

10356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FossFanatic
f84bdbd777 Merge branch 'master' into biome_skycolor_otherworlds 2023-01-24 07:22:04 +00:00
FossFanatic
7712c45c4e Fix conflict 2023-01-24 07:21:48 +00:00
ancientmarinerdev
02ee8b757d Merge pull request 'Biome Colour Palette Fixes' (#3203) from simplified_palette_index into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3203
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-24 00:21:12 +00:00
PrairieWind
5c32d1c106 Merge pull request 'Fix crash when leaves don't have a registered orphan but try to rot' (#3346) from rubber_crash_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3346
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2023-01-23 22:02:24 +00:00
ancientmarinerdev
c4ea504123 Fix crash when leaves don't have a registered orphan but try to rot 2023-01-23 20:58:05 +00:00
ancientmarinerdev
6d60fb4160 Merge pull request 'Add some mob object checks to avoid crashing' (#3324) from fix_ghast_kill_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3324
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-01-23 20:19:34 +00:00
ancientmarinerdev
e4f26a4688 Fix self object checks for check suspend 2023-01-23 20:10:28 +00:00
ancientmarinerdev
af86e73280 Fix self object reference in player_in_active_range 2023-01-23 20:10:28 +00:00
ancientmarinerdev
32be8f9602 Fix more self object references in falling 2023-01-23 20:10:28 +00:00
ancientmarinerdev
15560d969c Change order of mob step 2023-01-23 20:10:28 +00:00
ancientmarinerdev
6bbf3af97b Remove log line 2023-01-23 20:10:28 +00:00
ancientmarinerdev
84317afc93 Review feedback implemented and planned changes 2023-01-23 20:10:28 +00:00
ancientmarinerdev
2cd6629ae1 Add some mob object checks to avoid crashing 2023-01-23 20:10:28 +00:00
FossFanatic
9afdd09d9d Fix wrong init accident 
I accidentally put the `init.lua` of `mcl_biomes` instead of `mcl_mapgen_core` in my previous commit. This fixes that.
 2023-01-23 10:25:48 +00:00
ancientmarinerdev
9a276489d1 Merge pull request 'Fix assist death messages rarely showing up' (#3265) from CyberMango/MineClone2:dev/mango/assist_death_messages_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3265
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-22 23:31:58 +00:00
CyberMango
e2cbd4267c Added back sweet berries death messages. 2023-01-22 22:59:28 +02:00
CyberMango
4ec506b534 Turned a global constant into local. 2023-01-22 22:59:28 +02:00
CyberMango
06435e0f4c Mixed 2 conditions into 1. 2023-01-22 22:59:28 +02:00
CyberMango
a1d98c080f Now only allowing players and lua entities to do assist kills. 2023-01-22 22:59:28 +02:00
CyberMango
96cd2657db Cleanup and removed debug prints. 2023-01-22 22:59:23 +02:00
CyberMango
cd63f32cdd Fixed and optimized assist death messages. 
Still left many log messages, a longer timeout and some unclean parts.
 2023-01-22 22:58:46 +02:00
FossFanatic
2d81d153bd Unsimplify the LBM 2023-01-22 18:02:31 +00:00
FossFanatic
dc7a46df4e Simplify the LBM even more 2023-01-22 17:46:17 +00:00
FossFanatic
ad25b0bc4b Make set palette safer 2023-01-22 16:51:40 +00:00
FossFanatic
b77260253a Make grass palette fix LBM more efficient 2023-01-22 15:59:10 +00:00
ancientmarinerdev
ad9beebc70 Merge pull request 'Extra Breaking Animation Frame' (#3343) from extra_break_animation_frame into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3343
Reviewed-by: AFCMS <afcm.contact@gmail.com>
 2023-01-22 15:07:25 +00:00
FossFanatic
b6951d00b9 Add an extra frame to the breaking animation 2023-01-22 15:06:51 +00:00
ancientmarinerdev
86e480aad0 Merge pull request 'Make sweet berries' velocity checks for damage conditions use absolute values.' (#3308) from CyberMango/MineClone2:dev/mango/make_berries_velocity_check_absolute into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3308
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-22 00:56:48 +00:00
ancientmarinerdev
ce7d493890 Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-22 00:45:53 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
995679d7ae Merge pull request 'Fix most deaths not producing a death message.' (#3332) from CyberMango/MineClone2:dev/mango/fix_mt_deaths_messages into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3332
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-01-20 22:32:22 +00:00
CyberMango
c57f797226 Make the velocity checks absolute. 
Now sweet berries will cause damage in all directions.
 2023-01-20 19:15:55 +02:00
CyberMango
78f32d2dd4 Removed the approved field from death reasons. 
This created a strange bug that only death reasons created by
mcl_utils.deal_damage were "approved" so only they triggered running the
death callbacks, so only they triggered printing a death message.
Therefore most deaths did not produce a death message.
 2023-01-20 19:15:21 +02:00
FossFanatic
a1ad84370c Move locals upward & uncomment some things 
Some locals relating to the biome sky colours and fog colours have been moved upward since there otherwise were some issues.

The sky colours and fog colours of the Nether & End biomes have also been uncommented.
 2023-01-20 15:44:03 +00:00
FossFanatic
f6a3fe2128 Make Nether & End use biome sky- or fog colours 2023-01-20 15:41:44 +00:00
ancientmarinerdev
1c65e0ad68 Merge pull request 'Add how to play notes' (#3341) from add_download_notes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3341
 2023-01-20 15:15:51 +00:00
ancientmarinerdev
6900748429 Add how to play notes 2023-01-20 15:14:45 +00:00
ancientmarinerdev
f09b723885 Merge pull request 'Release 0.82' (#3337) from release_0_82_0 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3337
 2023-01-20 14:43:45 +00:00
ancientmarinerdev
efd3420d52 Post-release set version 0.82.0-SNAPSHOT 2023-01-19 23:34:04 +00:00
ancientmarinerdev
62be5a06f6 Update release notes 0.82.0 2023-01-19 22:22:48 +00:00
ancientmarinerdev
683799aea5 Update release steps 2023-01-19 21:54:01 +00:00
ancientmarinerdev
383cbf96a6 Pre-release set version 0.82.0 2023-01-19 21:51:16 +00:00
ancientmarinerdev
a7632e767d Run credits update script for release 0.82 2023-01-19 21:09:42 +00:00
ancientmarinerdev
99d09c76ae Merge pull request 'mcl_bamboo2_cleanup' (#3327) from mcl_bamboo2_cleanup into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3327
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-19 21:01:08 +00:00
ancientmarinerdev
c7ebe1b8cd Updated Bamboo textures by Nicu. Updated credits as per request from Michieal 2023-01-19 20:51:49 +00:00
ancientmarinerdev
5c464f1c1d Merge pull request 'Grass Footstep Sound Fix' (#3312) from grass_sound_revert into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3312
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-19 13:02:38 +00:00
ancientmarinerdev
87e6842c00 Merge pull request 'Update credits' (#3334) from release_0_82_credits into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3334
 2023-01-19 01:36:13 +00:00
Michieal
b258ccffdc Merge Master into mcl_bamboo_cleanup 2023-01-18 20:29:40 -05:00
ancientmarinerdev
83b0807218 Update credits 2023-01-19 00:04:16 +00:00
Michieal
a00ef4500d Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-18 18:40:23 -05:00
PrairieWind
c49aef3251 Merge pull request 'Disable zombie siege raid until we stop zombies pathing through door' (#3329) from disable_zombie_siege into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3329
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2023-01-18 20:51:04 +00:00