ChrisPHP
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge with master. #1

Merged
ChrisPHP merged 91 commits from VoxeLibre/VoxeLibre:master into master 2022-08-13 12:14:28 +02:00
Conversation 0 Commits 91 Files Changed 41 +644 -217

91 Commits

Author SHA1 Message Date
cora 77cb2277cd Merge pull request 'variable in mcl_beacons gets reinitalized for no reason' (#2562) from minor_beacon_codestyle_fix into master 
Reviewed-on: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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
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
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
Sumyjkl 99eca2ceb9 player will not be upside down when flying or swimming 2022-08-08 02:05:03 +10:00
Sumyjkl 9fdcfcd898 significanltly more accurate values, much slower, more reliable physics, more comments 2022-08-08 00:05:00 +10:00
Sumyjkl 5a8216ba43 moved functions and constants out of global step (oops) 2022-08-07 23:12:57 +10:00
SumianVoice 49089ed8c4 Merge branch 'master' into elytra-overhaul 2022-08-07 10:18:14 +00:00
Sumyjkl 02c92dc6f8 fix getting wrong node 2022-08-07 01:05:39 +10:00
Sumyjkl 509fadfebb fix is_pressing_jump being global 2022-08-07 00:38:20 +10:00
Sumyjkl 1263c43b5d elytra and other non-combat armour don't take durability damage when the player is attacked 2022-08-06 14:38:42 +10:00
Sumyjkl cd6da88b37 tweaks again 2022-08-05 14:43:48 +10:00
Sumyjkl 3c0992e58d tweaks 2022-08-03 18:41:51 +10:00
Sumyjkl 4df51bac72 code quality, minor tweaks 2022-08-03 01:03:28 +10:00
Sumyjkl b7a5a74ccf less pitch up slowdown 2022-08-03 00:14:31 +10:00
Sumyjkl ece79cad8a prevent player from getting hyperspeed while flying from ground 2022-08-03 00:08:30 +10:00
Sumyjkl 845e43c143 tweaked several things 2022-08-02 23:51:21 +10:00
Sumyjkl aa93ce4b3a tweaked slowdown on pitch up 2022-08-02 23:45:20 +10:00
Sumyjkl 12af0e7de8 semi-working on 0.3 server step 2022-08-02 23:42:04 +10:00
Sumyjkl 32a57133ac use dtime 2022-08-02 22:47:51 +10:00
Sumyjkl 5c085bd28f prevent player gaining infinite momentum by spamming jump while running, added dtime dependent velocity 2022-08-02 22:06:19 +10:00
Sumyjkl c80012a14f fix gravity not being reset when died after rocketing 2022-08-02 21:23:05 +10:00
SumianVoice e28c0d311a Merge branch 'master' into elytra-overhaul 2022-08-02 10:27:14 +00:00
SumianVoice fab3c35c28 Merge branch 'master' into elytra-overhaul 2022-08-02 09:44:51 +00:00
Sumyjkl 0f6a51a031 remove unused file scope variables 2022-08-02 18:39:15 +10:00
Sumyjkl 1468acf6d4 move player up to give clearance when start flying 2022-08-02 18:26:00 +10:00
Sumyjkl 5fd66d1850 can pitch up without losing too much speed 2022-08-02 18:12:15 +10:00
Sumyjkl 8378ca92e2 turning slows the player down in fly mode 2022-08-02 08:20:08 +10:00
Sumyjkl 2b5e3b5123 code quality: combine add_velocity calls into one 2022-08-02 00:14:24 +10:00
Sumyjkl 368ffda75b can only fly when pressed jump and cannot hold jump to enter fly mode, set speed to player velocity when entered fly mode 2022-08-01 23:45:41 +10:00
Sumyjkl cd62278336 improved code quality 2022-08-01 23:01:27 +10:00
Sumyjkl 9e1b0184c5 fireworks function, slight balancing, removed debug starting speed 2022-08-01 22:15:36 +10:00
Sumyjkl 20b229a9b9 pitching up too far can make player fall fast 2022-08-01 20:53:35 +10:00
Sumyjkl 832b0afdd6 more reasonable values 2022-08-01 20:51:08 +10:00
Sumyjkl 177cf231b6 make elytra better again 2022-08-01 20:34:56 +10:00
Sumyjkl 696cc150b4 broke elytra 2022-08-01 20:12:53 +10:00
Sumyjkl 8f4388c4c8 elytra less sensitive to landing, allows entering flight without as much downward velocity 2022-08-01 17:42:43 +10:00