teknomunk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
12,537 Commits 84 Branches 80 Tags 170 MiB
Commit Graph

693 Commits

Author SHA1 Message Date
AFCMS 3bbae86baf
Fix this stupid merge conflict 2023-08-19 18:01:29 +02:00
cora ee4f7d1b88
Fix rebase breaking creative digging 2023-08-19 18:01:29 +02:00
AFCMS 7d8a1e1e5f
Fix some merging stuff 2023-08-19 18:01:29 +02:00
AFCMS 093d55861c
Basic mcl_gamemode documentation 2023-08-19 18:01:27 +02:00
AFCMS fbb51835b3
survival inventory tabs API + mcl_gamemode 2023-08-19 18:01:26 +02:00
AFCMS c2032fe4de
Fix 2023-08-19 18:01:25 +02:00
AFCMS 691b93ac68
Modern Survival Inventory (9 slice images, formspec v6) 2023-08-19 18:01:25 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6756358307 Fix meshhand with mcl_skins disabled 2023-08-16 08:06:12 -05:00
ancientmarinerdev 8b9b4b00e5 Fix elytra crash when flying over unknown node 2023-06-21 20:47:54 +00:00
ancientmarinerdev 088f8dec2f Fix server crash for unknown node below. 2023-06-21 20:47:54 +00:00
Temak f7f8a72d08 Update russian translation (#3519) 
Update russian translation by Temak

Reviewed-on: MineClone2/MineClone2#3519
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Temak <artemkotlubai@yandex.ru>
Co-committed-by: Temak <artemkotlubai@yandex.ru>
 2023-06-19 21:54:51 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f1d17e2c69 mcl_skins: PR feedback 2023-05-26 20:27:11 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 26f033932e Add mcl_custom_skins info to README 2023-05-26 20:27:11 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 1e63f3931a Skins update 2023-05-26 20:27:11 +00:00
ancientmarinerdev 7726e576f0 Remove oopsie 2023-05-11 17:30:28 +00:00
ancientmarinerdev d920441a01 Reduce network activity for elytra flying rocket particles 2023-05-11 17:30:28 +00:00
PrairieWind b001e4e06f Make elytra active checks use groups instead 
So that modders can easily add their own varients of elytra that work
 2023-04-27 20:53:49 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ec5b0903be Make enchanted elytra usable 2023-04-27 20:53:49 +00:00
megustanlosfrijoles 7dc09e3ebd Add spanish translations (#3659) 
I just added some translations to Spanish that were missing

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: MineClone2/MineClone2#3659
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
 2023-04-27 19:50:10 +00:00
chmodsayshello 5db1e1876c playerbound music toggle (between 94e554aa1a and 5481f0109c) 2023-04-25 17:24:17 +02:00
syl ac4073a259 Improve french translation 2023-04-07 17:05:06 +02:00
ancientmarinerdev 3e6b43ad47 Elytra moves quicker than mapgen can cope. A bit performance hit on servers. Make this configurable. 2023-04-02 20:27:02 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 bef204f548 Remove mcl_player_init 2023-03-30 18:18:57 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a52931f986 Fix mcl_skins crash 2023-03-24 15:53:07 -05:00
ancientmarinerdev c393b15965 Updated music to 64kbs 2023-03-23 01:18:14 +00:00
ancientmarinerdev f5ea3894cf 2 new songs. 2 updated songs. All volums remastered to same perceived volumes. 2023-03-23 01:18:14 +00:00
ancientmarinerdev 3b4fc04330 Merge pull request 'Remove unused translations' (#3539) from syl/MineClone2:unusedtranslations into master 
Reviewed-on: MineClone2/MineClone2#3539
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-18 18:09:37 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 75dffe5059 Fix verbose tool info on non-tools 2023-03-15 15:36:48 +00:00
syl 8a7a8ce1bf Remove unused translations 2023-03-13 15:40:58 +01:00
ancientmarinerdev 03d8363ed1 Ensure HP change doesn't stop music 2023-03-12 23:09:46 +00:00
ancientmarinerdev ede3123b1a Remove music interruptions 2023-03-12 23:09:46 +00:00
ancientmarinerdev 4c5b057038 Removed duplicate track 2023-03-07 15:56:24 +00:00
ancientmarinerdev 1dcdbbef79 Adding Exhale & Tim Unwin tracks into the playlists 2023-03-07 15:56:24 +00:00
ancientmarinerdev 37b42a1033 Shrink audio files with added metadata 2023-03-07 15:56:24 +00:00
ancientmarinerdev d32e968682 Add original Exhale & Tim Unwin first two tracks 2023-03-07 15:56:24 +00:00
ancientmarinerdev a116c67dcd Reduce size of Jester tracks 2023-03-04 20:22:04 +00:00
ancientmarinerdev 1937241a71 Fix logging 2023-03-04 20:22:04 +00:00
ancientmarinerdev 10fa91cc42 Adding the first 4 Jester trackers made for MineClone2 2023-03-04 20:22:04 +00:00
ancientmarinerdev 83ff2f1754 Enable expansion of music choices 2023-03-04 20:22:04 +00:00
ancientmarinerdev 7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master 
Reviewed-on: MineClone2/MineClone2#3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 03:23:13 +00:00
FossFanatic 0c0845c1bd Change the underwater detection code a bit 2023-02-01 22:50:50 +00:00
FossFanatic 3546d04aaa Remove water HUD code 2023-02-01 22:50:50 +00:00
FossFanatic 1abd226e07 Remove water HUD 2023-02-01 22:50:50 +00:00
Michieal 7f84922403 fix missing skin file 2023-01-30 23:14:44 -05:00
Michieal 025f97187a Adjust for mcl_skins requirements. 2023-01-30 23:07:23 -05:00
Michieal 6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8cf6269dda Fix mesh hand unknown item bug + fix fast digging disabled for simple skins 2023-01-25 12:13:53 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 66ff8ab8a9 Add a creative dig speed setting 2023-01-24 11:16:28 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a1cc24f8d3 Slowing creative digging 2023-01-24 11:16:28 -06:00
AFCMS 33e2b79b2b Make nearby light blocks spawn particles when player wield one 2023-01-15 15:32:42 +00:00
FossFanatic 60b19b31ab Add hyphenation 
This also adds hyphenation to `In-game`.
 2023-01-14 10:21:35 +00:00
ancientmarinerdev ce485e89cd In game music review feedback fix 2023-01-13 15:04:40 -06:00
ancientmarinerdev 09a7348256 Give an option for players to disable the in game music 2023-01-13 15:04:40 -06:00
ancientmarinerdev 3ed32abc4e Add credit for nether music 2023-01-10 19:05:56 +00:00
kay27 9db6050638 Fix music interruption 2023-01-10 19:05:56 +00:00
kay27 7ceb953a56 Add different music for different dimensions 2023-01-10 19:05:56 +00:00
kay27 1894d8c5f0 Fix mcl_music: play to all players, play every day, overworld only 2023-01-10 19:05:56 +00:00
kay27 419d61edde Add trivial mcl_music mod and a piano track by diminixed 2023-01-10 19:05:55 +00:00
iliekprogrammar 2ea72ccda8 Merge branch 'master' into mcl-meshhand-fixes 2022-12-30 18:47:55 +00:00
Riu Sakura 2b61231f82 add japanese translation 2022-12-19 15:33:31 +09:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a6db44b71f Base mcl_skins templates off old PP skins 2022-11-17 21:52:35 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d764c3eac3 Make Steve hair unlike MC 2022-11-17 05:30:55 +00:00
cora eeecc52ff8 Fix crash when trying to place meshhand 2022-11-16 12:23:39 -06:00
epCode 3f8f6f8e44 deeper-darker image 2022-11-15 22:36:05 +00:00
epCode a5eb1d240e add deeper = darker 2022-11-15 22:36:05 +00:00
cora dbef60c558 Fix crash when new player rightclicks a bed 2022-11-15 22:02:37 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 3d6ff573e7 Fix undeclared global variable in mcl_playerplus 2022-11-14 12:40:45 -06:00
AFCMS 4acee8e64e
Fixes to `mcl_meshhand` 
- fix actual crash when placing hand in world (undefined function)
- remove node fields redundant with default values
- remove support for `use_texture_alpha_string_modes`
- type annotation
- more explicit functions
 2022-11-13 21:54:59 +01:00
ancientmarinerdev 3000a378f3 Villagers can claim any bed. Player can steal villager bed. Villager won't take player bed 2022-11-12 02:35:00 +01:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8ff4a94889 mcl_playerplus: Fix bows 2022-11-11 17:53:13 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 c66e184373 mcl_playerplus fixes 2022-11-11 17:53:13 +00:00
cora 3a37b1c8cc Add a setting to disable hunger 2022-11-03 14:31:08 +01:00
epCode 8abdd852fc fix player head rotation 2022-10-17 12:00:55 +02:00
epCode d466693f27 make player not walk while using elytra 2022-10-17 12:00:55 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 36427d5aef Check enable damage instead of creative mode in some cases 2022-10-09 21:45:05 +02:00
cora 68d04bc4e8 move set_conditionals from mcl_playerplus to mcl_util 2022-10-07 02:45:01 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f5cd23908f Fix displaying model element on MT 5.4 2022-09-16 18:09:15 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 18f8768909 Fix invisibility potion when changing skin 2022-09-15 12:04:20 -05:00
PrairieWind 08aa05419f Re-add gitignore file to mcl_skins 2022-09-06 19:25:58 -06:00
PrairieWind 99a3d0c290 Re add alex skin 2022-09-06 19:23:06 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 413c6292ff Add simple skins skins support 2022-09-06 12:51:43 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8e6b6393c2 Add advanced skin customization 2022-09-06 12:16:46 -05:00
3raven 5329e70df9 Merge branch 'master' into master 2022-08-31 17:04:43 +00:00
cora 0a45486304 Make items not drop into blocks on playerdeath 2022-08-26 02:32:16 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 71cfa67c7d Fix wieldview in MT 5.6 2022-08-23 10:11:21 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 60f3d4b74c set_attach: remove default parameters 2022-08-23 10:08:22 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ba55e4286f Remove image stack wieldview: code review improvment 2022-08-23 10:08:22 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 587f9be4d7 Remove image stack wieldview 2022-08-23 10:08:22 -05:00
3raven 71424aa5fb update+corrections 2022-08-22 21:54:28 +00: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
opfromthestart f0837bdee6 Swimming collides with ice properly 2022-08-11 15:35:40 +02:00
Sumyjkl 25491b3882 prevent player from gaining too much speed by pitching down and spamming jump 2022-08-10 13:24:08 +10: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
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
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 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
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
cora f1915ef2f1 Fix globalstep in mcl_hunger taking a long time 2022-07-26 00:27:34 +02:00
cora 8556226cf7 Move check to the top of the function 2022-07-24 23:38:24 +02:00
cora 323a1f6e18 Fix mcl_sprint globalstep taking long 2022-07-24 12:55:37 +02:00
SumianVoice de0a78012d fix getting stuck under non-opaque blocks 2022-07-18 10:09:04 +10:00
Sumyjkl 9062a6e22e add node_head_top to check to make sure you won't clip through blocks before going out of swim / fly mode 2022-07-17 23:14:24 +10:00
Sumyjkl a41cbb7ebf added comment and removed unnecessary code 2022-07-17 22:50:22 +10:00
Sumyjkl 4738834ddd remove unecessary code 2022-07-17 22:40:33 +10:00
Sumyjkl 2e06e22d70 removed unnecessary node_above_head variable 2022-07-17 21:50:22 +10:00
Sumyjkl e4c7d575fc take no damage when swimming near roof, no ability to no-clip through roof when swimming 2022-07-17 21:46:36 +10:00
MysticTempest e3abe72522 Fix healing speed, and saturation usage again; to be more accurate. 2022-06-25 01:41:10 -05:00
MysticTempest a6e2c94028 Tweak hunger/health mechanics: 
Ensure hunger is always ticking away, and ensure that health regen
is quicker when hunger bar is full.
And, tweak saturation to partially use up hunger to heal; instead
of healing on top of hunger.
 2022-06-24 05:38:26 -05:00
Lizzy Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Lizzy Fleckenstein e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
cora a1209b14a1 playerplus: fix deprc. add_player_velocity calls 2022-05-12 23:30:39 +00:00
chmodsayshello 6806ea311d code from inital PR 2022-05-08 19:57:09 +00:00
AFCMS 3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
NO11 5974b6f609 Merge branch 'master' into shields2 2022-03-28 12:27:57 +00:00
NO411 aeff7cf1a4 Remove offhand item on death 2022-03-22 12:48:41 +01: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
NO411 0f8f5a41d2 Fix dependencies 2022-03-15 16:30:03 +01:00
NO411 db68c0e26b Add shield 2022-03-15 15:58:27 +01:00
1F616EMO 615a968fbb mcl_skins 2022-02-23 23:58:05 +01:00
1F616EMO 3aff1f8981 mcl_hunger 2022-02-23 23:58:05 +01:00
1F616EMO f3d0ec845c mcl_spawn 2022-02-23 23:58:05 +01:00