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

8466 Commits (0bd0abc3274c8ef9a60ee534efce064bc27f2db2)

Author SHA1 Message Date
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
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
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 f6148068c5 snow layers and blocks drop nothing by hand 2022-08-07 19:55:01 +10:00
iliekprogrammar 0e999d8bb9
[5.6] remove incorrect marks. 
wrong, bad. these are fine.
 2022-08-07 13:00:43 +08:00
iliekprogrammar 156aff21a1
[5.6][bows] fix unsafe entity handling for arrows 2022-08-07 12:48:09 +08:00
iliekprogrammar 4f2789c498
[5.6][armor] fix unsafe entity handling (unsure) 
i'm not sure about this one, can't fnd a suitable test for it.
 2022-08-07 12:43:24 +08:00
iliekprogrammar bf80074d98
[5.6][mobs] fix unsafe entity handling (unsure) 
i'm not sure about this one, can't find a suitable test for it.
 2022-08-07 12:38:26 +08:00
iliekprogrammar 4b31692319
[5.6][boats] fix unsafe entity handling 
this probably does not affect normal gameplay, unless you can set boats on fire somehow
 2022-08-07 12:09:12 +08:00
iliekprogrammar bce4d29737
[5.6][lightning] fix unsafe entitiy handling 
this does not excuse all on_strike callbacks to allow oversights.
it must also track entity removal.
 2022-08-07 10:44:13 +08:00
iliekprogrammar 221ee0fcf1
[5.6] mark places with unsafe set_hp entity handling 
There might be other places i might be missing, but these are the obvious ones.

leftover entity handling i did not mark:
* everything that involves a apply()-like algorithm (e.g. callbacks) over the
  same list of objects.
* in mcl_damage, it's not known whether mcl_damage.from_mt() would involve
  entity handling or just player handling.
 2022-08-07 00:13:03 +08:00
cora 3922c5bdca Merge pull request 'Nerf shipwreck loot' (#2519) from fix_shipwreck_loot into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2519
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2022-08-04 22:58:27 +00:00
cora 27304d5d96 Nerf shipwreck loot 2022-08-04 04:21:59 +02:00
cora c8012ccffd Merge pull request 'add dependency for mcl_weather to mcl_burning to hopefully avoid crashes' (#2516) from SumianVoice/MineClone2_c:mcl_burning_depend into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2516
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-08-04 01:49:13 +00:00
SumianVoice 3f73dc1794 Merge branch 'master' into mcl_burning_depend 2022-08-03 12:55:07 +00:00
Sumyjkl eb89466436 add dependency for mcl_weather to mcl_burning to hopefully avoid crashes 2022-08-03 22:45:15 +10:00
cora d1d2b03635 Merge pull request 'Add mangrove swamps' (#2503) from mangrove_swamps into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2503
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-08-03 10:39:20 +00:00