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

8549 Commits (36c933dd5c430474c96607e210bdb30fb0c327f9)

Author SHA1 Message Date
cora 36c933dd5c Merge pull request 'Pillagers' (#2545) from pillagers into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2545
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-15 23:58:17 +00:00
Johannes Fritz 181eb96c6d Fix up pillagers 2022-08-16 01:53:42 +02:00
PrairieWind 092b746b0b Add Pillager and Evoker Spawning to Pillager Outpost 2022-08-16 01:53:42 +02:00
PrairieAstronomer 24939326c4 Fixed the pillager so he shoots, along with the animation 2022-08-16 01:53:42 +02:00
PrairieAstronomer a48664b8b3 Changed mobs to mcl_mobs in some spots 2022-08-16 01:53:42 +02:00
Johannes Fritz d7e950ab7b Pillagers: spawn with loaded crossbow 2022-08-16 01:53:42 +02:00
Johannes Fritz dd96dd097c Basic Pillagers 2022-08-16 01:53:42 +02:00
chmodsayshello 4b2e084c81 Merge pull request 'Update ingame credits' (#2571) from credit_update into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2571
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-08-15 18:17:04 +00:00
chmodsayshello 7ee38fef83 update credits (again) 2022-08-15 14:08:59 +00:00
cora 281e7273ef Merge pull request 'Fix 'spawn_in_group_min' warning' (#2567) from spawn_in_group_warning into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2567
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-15 10:01:38 +00:00
cora f27b2d9714 Fix 'spawn_in_group_min' warning 2022-08-15 11:58:39 +02:00
cora 8666677ef2 Merge pull request 'Log player position on death' (#2568) from log_player_deathpos into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2568
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-15 09:57:58 +00:00
cora ba35f19f71 Log player position on death 
So people can find their items easier
 2022-08-15 11:57:11 +02:00
cora c0edc00789 Merge pull request 'make endermen TP out of sunlight' (#2563) from endermen_suntp into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2563
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-14 20:18:30 +00:00
cora fba63c4721 Merge branch 'master' into endermen_suntp 2022-08-14 20:15:38 +00:00
cora cb83c34b52 Merge pull request 'registration of mapgen node functions was overwriting previously registered mapgen functions' (#2565) from FaceDeer/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2565
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-14 09:38:17 +00:00
FaceDeer 1a09b5c132 fixing registration of node functions 
"#registered_generators" was attempting to count a non-array table and was always returning 0. So every node function registered was named "mod_1" and overwrote each other in that index.

also, "nodes" wasn't counting node_functions, it was counting lvm_functions.
 2022-08-14 01:11:30 -06:00
cora ecd1d13b43 Endermen TP out of sunlight 
If not attacking a player endermen randomly tp around until they
find a spot that is not in direct sunlight
 2022-08-13 23:23:01 +02:00
cora 77cb2277cd Merge pull request 'variable in mcl_beacons gets reinitalized for no reason' (#2562) from minor_beacon_codestyle_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2562
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-13 09:56:53 +00:00
chmodsayshello 21324aa0a5 variable in mcl_beacons gets reinitalized for no reason 2022-08-13 11:54:34 +02:00
cora b07652d6ca Merge pull request 'elytra physics overhaul' (#2511) from SumianVoice/MineClone2_c:elytra-overhaul into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2511
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-13 09:52:21 +00:00
cora f48f158f50 Merge pull request 'Set version to 0.79 indev' (#2560) from release_0.78 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2560
 2022-08-13 09:10:15 +00:00
cora 3cfa8a848b Set version to 0.79 indev 2022-08-13 03:14:29 +00:00
cora 9231ce0754 Merge pull request 'Release 0.78' (#2559) from release_0.78 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2559
 2022-08-13 02:58:57 +00:00
cora 2290968ce9 Set version to 0.78 2022-08-13 04:55:20 +02:00
cora e8f39deede Update credits 2022-08-13 04:55:10 +02:00
cora f7ffa6f700 Merge pull request 'Fix villagers positional sounds' (#2556) from villager_sounds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2556
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-12 22:53:21 +00:00
cora 3620db7c14 Add objectref to villager sound_play for pos sound 2022-08-13 00:47:46 +02:00
cora 68d5a81b1c Villager sounds -> mono 2022-08-13 00:47:46 +02:00
cora 2d35292bc3 Merge pull request 'Enable shadows and waving liquids when supported (5.6)' (#2555) from shadows_waving into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2555
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-12 22:07:55 +00:00
cora 7be8ab2c1c Send shadows to client if server supports it 2022-08-13 00:04:44 +02:00
cora 442fefebf2 Waving water 2022-08-13 00:04:44 +02:00
cora 0debaf12c0 Merge pull request '[heads] heads may now be placed on ceilings, upside down' (#2558) from heads_ceiling into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2558
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-12 21:39:14 +00:00
iliekprogrammar 7482f84929
[heads] heads may now be placed on ceilings, upside down 2022-08-13 02:44:47 +08:00
cora 1bc082ee4f Merge pull request 'Fix items floating into the air under rare circumstances' (#2553) from fix_item_floating into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2553
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-12 13:18:10 +00:00
Sumyjkl 16c9a83a96 fix items floating into the air under rare circumstances 2022-08-12 21:46:17 +10:00
Sumyjkl 307140b9a4 still over it 2022-08-12 13:03:11 +10:00
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