lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,912 Commits 2 Branches 67 Tags 77 MiB
7451e4734f
Commit Graph

8912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cora
ef7ebda90c Merge pull request 'fire-HUD-crashfix' (#2093) from fire-HUD-crashfix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2093

Tested and verified it fixes the crash
 2022-03-30 10:20:24 +00:00
kabou
1b99b73894 Fix wrong player name accessor. 
* Duh..
 2022-03-30 01:31:38 +02:00
kabou
14da059ce7 Add extra check and warning on missing player data. 
* For some unexplained reason, `mcl_burning.storage[player]` can
  sometimes be `nil`, causing a crash in `on_leaveplayer()`.  This
  commit adds a check for that.  If a `nil` is encountered, a sane
  value is substituted and a warning is set to the log.
 2022-03-29 12:06:00 +02:00
cora
04f0ea260d Merge pull request 'Add shields and offhand (Fix #295)' (#2073) from NO11/MineClone2:shields2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2073
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-28 14:55:11 +00:00
NO11
5974b6f609 Merge branch 'master' into shields2 2022-03-28 12:27:57 +00:00
NO411
148be4ea39 Fix shield behavior 2022-03-27 19:52:36 +02:00
NO411
6afe7cfb58 Fix typo and interact bug? 2022-03-27 18:08:43 +02:00
cora
8e24e6edfe Merge pull request 'Fix Barrel protection and add proper log for interactions (#2086)' (#2087) from barrel_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2087
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-25 13:16:52 +00:00
AFCMS
909b77ce4d
barrel protection fix + log 2022-03-25 13:28:33 +01:00
cora
1dde51dd0b Merge pull request 'Fix passive mobs not spawning in certain biomes ( #2069 )' (#2085) from fix-mobs-spawning into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2085
 2022-03-24 16:00:24 +00:00
NO11
63a156c30c Fix typo/crash 2022-03-23 18:30:34 +00:00
cora
1c9f0c3238 don't spawn mobs on non opaque nodes or leaves 
with the preliminary jordanspaning mobs would spawn on trees
and water regularly.
 2022-03-22 22:02:15 +01:00
cora
50e99f470e fix certain mobs not spawning in certain biomes 2022-03-22 15:16:48 +01:00
NO411
aeff7cf1a4 Remove offhand item on death 2022-03-22 12:48:41 +01:00
cora
bc723616ea Merge pull request 'Fix undefined luaentity crash.' (#2084) from fix-unregistered-collisions into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2084
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-21 10:31:20 +00:00
kabou
46ee5aaa59 Fix undefined luaentity crash. 
* Add nil check to get_luaentity() access.
* Cache get_luaentity() call in local var.
 2022-03-21 01:39:02 +00:00
cora
3dd4eec4e8 Merge pull request 'Add group:supported_node (for carpets).' (#2077) from kabou/MineClone2:add-group-supported_nodes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2077
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-21 00:31:53 +00:00
NO411
019dd45381 Check for damager 2022-03-19 16:50:19 +01:00
NO411
d481f7b720 Fix showing shield hud at the wrong side for half a second 2022-03-19 15:59:59 +01:00
NO411
c94964d10a Remove debug line 2022-03-19 15:26:41 +01:00
kabou
a9a3f01a0e Tiny comment fix. 2022-03-19 03:16:15 +01:00
kabou
ae6bea73fd Make carpets supported_node. 
* Change carpet from `group:attached_node` to `group:supported_node`,
  allowing carpets to be placed on top of torches, water source blocks
  and other non-walkable nodes, like in MC.
 2022-03-19 02:32:46 +01:00
kabou
2002872af8 Add group supported_node to GROUPS.md. 2022-03-19 02:32:29 +01:00
kabou
8518ce2c19 Add support for group:supported_node 
* Add support for `group:supported_node` to CORE/mcl_attached.
  Supported nodes are nodes that can be placed on any node that does not
  have the `drawtype = "airlike"` attribute.
* Copy the `drop_attached_node()` function from minetest/builtin, so
  that the override function provides the same behavior when nodes drop.
* Add comments to CORE/mcl_attached and to the functions defined in it.
* Add more local aliases for global minetest.* functions.
* If the original function returns true, it is not necessary anymore
  to perform more tests and the override function can simply return true
  immediately.
 2022-03-19 02:32:13 +01:00
NO411
6158e4e50d Don't always update shield texture using set_properties 2022-03-18 23:23:01 +01:00
NO411
7c0a48bebf Remove some code ... 2022-03-18 23:08:50 +01:00
NO411
5bdf83cbfc Revert weird changes 2022-03-18 23:07:25 +01:00
NO411
976cfba53a Make it possible to xraft a banner on an enchanted shield 2022-03-18 23:02:51 +01:00
NO411
fc9e83c059 Make it possible to craft a banner on an enchanted shield 2022-03-18 23:02:25 +01:00
NO411
60d877b718 Fix enchanting shield on enchanting table possible 2022-03-18 22:45:12 +01:00
cora
81a1b9973a Merge pull request 'More burning HUD fixes (kabou)' (#2076) from fix-burning-hud into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2076
 2022-03-18 10:52:07 +00:00
kabou
9eba0e4860 Remove unused code. 
* Remove unused code that was commented out.  The code tried to find
  fire luaentities in the same spot as the newly created fire luaentity.
  It may have been intended to optimize getting set on fire multiple
  times, but it makes no sense as it does not discriminate between fire
  luaentities attached to the object set on fire and those attached to
  other objects.  The function that this code was in also has a better
  way to prevent adding multiple fire luaentities in the first place.
 2022-03-18 11:39:11 +01:00
kabou
90311da514 Preempt possible crash on nil in on_joinplayer. 
* In mineclone5 a crash was reported to occur when deserialization of
  storage returned nil in on_joinplayer.    https://git.minetest.land/
  MineClone5/MineClone5/commit/96c4fb60d8641b4181edb902ed24dbf173828d09
  This commit uses a different, but equally effective fix.
 2022-03-18 11:36:33 +01:00
kabou
e9ff2ba32a Minor changes to mcl_burning. 
* Remove animation_frame from fire entity state, it is now kept in the
  storage table of the parent entity.
* Rename animation_timer in fire entity table to _mcl_animation_timer,
  in line with mineclone2 policy on adding custom members to minetest
  tables.
* Comment out code that does nothing sensible.  Scheduled for deletion
  at a later time.
 2022-03-18 11:36:23 +01:00
cora
0b89149fe2 Merge pull request 'Update readme to reflect correct MT version, bump version to 0.73 (dev)' (#2074) from fix_readme_compat into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2074
 2022-03-17 21:07:44 +00:00
cora
7df6c8739e update version to 0.73.0 (in development) 2022-03-16 12:48:02 +01:00
cora
cd725137ae update readme to reflect correct MT version 2022-03-16 12:38:04 +01:00
NO411
0f8f5a41d2 Fix dependencies 2022-03-15 16:30:03 +01:00
NO411
db68c0e26b Add shield 2022-03-15 15:58:27 +01:00
NO11
627da6d305 Merge pull request 'master' (#16) from MineClone2/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/16
 2022-03-15 14:22:26 +00:00
cora
1803cc560d Merge pull request 'Remove stray work notes files.' (#2071) from delete-temp-notes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2071
 2022-03-15 11:05:46 +00:00
kabou
3f787f8305 Remove stray work notes files. 
* These temp files accidentally got added during the unregistered nodes
  fixes.
 2022-03-15 07:42:11 +01:00
epCode
9534624b21 Merge pull request 'fix #2068' (#2070) from epcode-patch-1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2070
 2022-03-15 02:18:32 +00:00
epCode
4483f4b6b6 fix #2068 2022-03-15 02:18:02 +00:00
cora
d3bfdb190e Merge pull request 'Fix frost walker enchant not protecting from magma block damage (#2064)' (#2065) from frost_walker_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2065
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-13 19:03:06 +00:00
AFCMS
47b1eeda74
fix frost walker enchant not protecting from magma block damage 2022-03-13 19:11:28 +01:00
cora
ba0e2cbf29 Merge pull request 'item pickup sound gain more MC like' (#2054) from pepebotella/MineClone2:pop_sound into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2054
 2022-03-13 14:08:48 +00:00
GNU Hacker
f430aec0cd
item pickup sound gain more MC like 2022-03-13 14:58:01 +01:00
NO11
a44846a82c Merge pull request 'master' (#15) from MineClone2/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/15
 2022-03-12 22:42:24 +00:00
cora
22edd08387 Merge pull request 'Make carpets walkable.' (#2060) from fix-carpets-walkable into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2060
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-12 13:37:29 +00:00