Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-23 16:39:33 +01:00
Code Issues Projects Releases Packages Wiki Activity
8512 commits 115 branches 83 tags 186 MiB
Commit graph

8512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sumyjkl
6cab000b2a fix merge conflict 2022-08-12 12:57:21 +10:00
Sumyjkl
c36fd90965 Merge remote-tracking branch 'refs/remotes/mclmaster/master' 
Conflicts:
	mods/PLAYER/mcl_playerplus/init.lua
 2022-08-12 12:55:50 +10:00
Sumyjkl
97472becfc I'm over it. 2022-08-12 02:26:22 +10:00
cora
c001d307f2 Merge pull request 'Swimming collides with ice properly (clean version of #2536)' (#2551) from ice_coll_fix_clean into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2551
 2022-08-11 13:39:38 +00:00
opfromthestart
f0837bdee6 Swimming collides with ice properly 2022-08-11 15:35:40 +02:00
cora
435df92cf9 Merge pull request 'Parrot fixes' (#2549) from parrot_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2549
 2022-08-11 12:39:16 +00:00
cora
374e30b4a5 stay on players shoulder in when flying in creative 2022-08-11 14:32:58 +02:00
cora
6101de8d68 Fix parrot punch spam 2022-08-11 14:32:58 +02:00
cora
0bd0abc327 Merge pull request 'Some structures fixes' (#2541) from structure_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2541
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-11 12:31:55 +00:00
cora
79ce9f89d3 More adaptive foundation height 2022-08-11 14:26:34 +02:00
cora
0bcbea4ce3 Add lots of water lakes to mangrove swamps 2022-08-11 14:26:34 +02:00
cora
b7f26e2ddc Add setting to selectively disable strucutres 2022-08-11 14:26:34 +02:00
cora
4f96b38fa3 Make foundations less cubic 2022-08-11 14:26:34 +02:00
cora
f1c70fe19d grass border for water lake 2022-08-11 14:26:34 +02:00
cora
cef559c573 Fix ruined portals y offset 2022-08-11 14:26:34 +02:00
cora
f86898b2f4 make ruined portals rarer 2022-08-11 14:26:34 +02:00
cora
db2f2cfc69 Merge pull request '[heads] refactor, delete unnecessary textures and implement 16 direction head nodes' (#2550) from heads_16_direction into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2550
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-11 12:25:34 +00:00
iliekprogrammar
efd1a023f0
Merge remote-tracking branch 'origin/master' into heads_16_direction 2022-08-11 18:12:19 +08:00
iliekprogrammar
de07209654
[heads] optimize textures 
`optipng -strip all -o7 -zm9`
 2022-08-11 17:34:20 +08:00
iliekprogrammar
29d221eed5
[heads] remove unnecessarily duplicative textures 
these textures are unnecessary to texture the head nodes. we can reuse
the available armor texture for both the headgear/helmet and the nodes.
 2022-08-11 17:28:37 +08:00
iliekprogrammar
44d234dd2c
[heads] implement 16 directional head node 2022-08-11 17:21:23 +08:00
iliekprogrammar
3ff9ed4419
[heads] refactor and trivial renames 2022-08-11 16:45:51 +08:00
cora
8ff938c3d0 Merge pull request 'Fix dispenser and dropper crash (in 5.4)' (#2544) from fix_dropper_dispenser_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2544
 2022-08-10 15:10:40 +00:00
cora
34ecb782a8 Fix dispenser and dropper crashing in 5.4 2022-08-10 16:58:00 +02:00
cora
70656b42dc Merge pull request 'boats are removed upon being set on fire (#2529)' (#2540) from opfromthestart/MineClone2:boat-fire-fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2540
 2022-08-10 13:54:03 +00:00
cora
953fe4df39 Merge pull request 'Fix some warnings' (#2539) from fix_some_warnings into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2539
 2022-08-10 12:17:14 +00:00
cora
e8baa1ae00 Fix undeclared var warning in mcl_weather 2022-08-10 14:14:00 +02:00
cora
701aee3238 Add modname to beacons mod.conf 2022-08-10 14:14:00 +02:00
cora
9603ee606c fix at mod loadtime warning in mcl_info 2022-08-10 14:14:00 +02:00
cora
2436a6d616 Merge pull request 'Fixed remaining get_sky calls (#2538)' (#2542) from opfromthestart/MineClone2:new_sky into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2542
 2022-08-10 11:41:19 +00:00
Sumyjkl
25491b3882 prevent player from gaining too much speed by pitching down and spamming jump 2022-08-10 13:24:08 +10:00
SumianVoice
22d296e898 Merge branch 'master' into elytra-overhaul 2022-08-10 00:02:47 +00:00
cora
9083552939 Merge pull request 'Pillager Outpost' (#2535) from pillager_outpost into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2535
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-09 20:59:38 +00:00
PrairieWind
70277276b0 Adjusted spawn chance and fixed the walls on generation, thanks cora. 2022-08-09 10:30:48 -06:00
PrairieWind
84691c393d Pillager Outpost, Schematics by RandomLegoBrick 2022-08-09 10:30:48 -06:00
opfromthestart
5da6f6812f faster boat death 2022-08-09 12:23:44 -04:00
opfromthestart
b8af222538 Fixed remaining get_sky calls 2022-08-08 20:26:31 -04:00
opfromthestart
8b06e5de87 Merge branch 'master' into boat-fire-fix 2022-08-09 00:16:14 +00:00
opfromthestart
76839961c6 Adds fire and lava collision to boats 2022-08-08 20:12:44 -04:00
cora
8d6a0bb564 Merge pull request 'fix deprecated player:get_sky (#2528)' (#2534) from opfromthestart/MineClone2:new_sky into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2534
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-08 23:16:18 +00:00
opfromthestart
e9954d1785 Merge branch 'master' into new_sky 2022-08-08 18:00:03 +00:00
Sumyjkl
dd9c8b3f48 more accurate physics again, prevent slow servers having slower flight 2022-08-08 11:50:23 +10:00
Sumyjkl
45c93e0340 accurater physics, can't spam jump to gain speed on flat ground (needs work to allow mc like boosting) 2022-08-08 10:50:06 +10:00
SumianVoice
eeca224f7b Merge branch 'master' into elytra-overhaul 2022-08-08 00:19:26 +00:00
opfromthestart
866711a4aa Changed to new get_sky method 2022-08-07 18:19:12 -04:00
cora
96ceb2fabb Merge pull request 'Light Level and Texture Clip Warning Fixes' (#2527) from fix_campfire_errors into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2527
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-07 21:40:21 +00:00
PrairieAstronomer
a34c9172c4 Fixed light levelwarnings and texture alpha warnings in stonecutter, campfires, and beacon 2022-08-07 21:38:40 +00:00
cora
2c814db0d7 Merge pull request 'Snow layers and blocks drop nothing by hand' (#2532) from SumianVoice/MineClone2_c:snow_drop_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2532
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-07 21:36:22 +00:00
cora
7b92bb89ce Merge pull request '[5.6] safely handle entities involving set_hp' (#2526) from iliekprogrammar/MineClone2:safe_entity_handling into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2526
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-07 21:05:11 +00:00
Sumyjkl
99eca2ceb9 player will not be upside down when flying or swimming 2022-08-08 02:05:03 +10:00