Commit graph

491 commits

Author SHA1 Message Date
Elias Fleckenstein
d8d4cb5def Revert color changes to GUI.
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
2021-04-19 14:44:20 +02:00
Elias Fleckenstein
ad3defdfb3 Merge branch 'master' into damage 2021-04-14 18:29:42 +02:00
j1233
46b1762872 credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-14 14:53:33 +00:00
Elias Fleckenstein
963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Elias Fleckenstein
6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
Elias Fleckenstein
ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
Elias Fleckenstein
421ab9f660 Add timeout to static hudbars 2021-04-13 08:42:17 +02:00
Elias Fleckenstein
5ddd1d0193 Merge branch 'master' into beta 2021-04-13 08:33:31 +02:00
Elias Fleckenstein
6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Elias Fleckenstein
b914e088cc Update README files 2021-04-12 14:03:51 +02:00
Elias Fleckenstein
24f8f9166b Fix #1528 2021-04-11 17:29:05 +02:00
Elias Fleckenstein
af044e6a96 Bossbars: Add support for non-mob bosses 2021-04-11 11:15:09 +02:00
Elias Fleckenstein
2313012f60 Fix #1528 2021-04-11 10:41:11 +02:00
Elias Fleckenstein
c6ffccfef5 Add priority to bossbars; display bossbars of closest bosses first 2021-04-09 13:35:58 +02:00
Elias Fleckenstein
cbd2731e06 Improve mcl_bossbars performance 2021-04-09 13:22:45 +02:00
Elias Fleckenstein
d77affca91 Change max_bossbars default to 4 2021-04-07 17:39:13 +02:00
Elias Fleckenstein
6c35ff1fc5 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 17:02:46 +02:00
Elias Fleckenstein
567f157541 Add a bossbar limit setting 2021-04-07 17:02:03 +02:00
Elias Fleckenstein
f282cd0c4d Allow bossbars to be grouped 2021-04-07 16:56:21 +02:00
Elias Fleckenstein
3449b3eb7c Improve bossbars API 2021-04-07 16:47:14 +02:00
iliekprogrammar
61cef21cd1 Add right-to-left statbars, for hunger and air. 2021-04-07 22:26:42 +08:00
Elias Fleckenstein
3c73ad3b98 Add ztianyang to credits 2021-04-06 16:06:44 +02:00
Elias Fleckenstein
91e2372df0 Merge branch 'master' into credits 2021-04-06 16:06:12 +02:00
Elias Fleckenstein
f350fa6272 Add bossbars 2021-04-06 14:50:34 +02:00
Elias Fleckenstein
5bdb3bc274 Add MineClone5 section to credits 2021-04-06 12:14:43 +02:00
Elias Fleckenstein
ba15f01ca9 Add translations; Duplicate listing of people 2021-04-06 12:08:25 +02:00
Elias Fleckenstein
d07e415b37 Add credits screen 2021-04-06 11:55:21 +02:00
Elias Fleckenstein
90f312f772 Add credits overlay prototype 2021-04-04 19:13:46 +02:00
AFCMS
b68c4b07c1 tweak hudbars 2021-04-02 17:20:19 +02:00
AFCMS
84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
kay27
54e7529754 [mcl_achievements] Add mcl:stoneAge, mcl:hotStuff, mcl:obsidian 2021-03-28 04:32:57 +04:00
AFCMS
202e30a782 Add API to mcl_tmp_message 2021-03-26 21:37:10 +01:00
AFCMS
01eba30058 Fix #1234 2021-03-26 14:32:08 +01:00
AFCMS
41768e95a1 fix 2021-03-26 11:50:14 +01:00
AFCMS
c0308c7c08 fix weird death message (#1378) 2021-03-26 11:49:41 +01:00
AFCMS
5d17a6b699 fix SO MANY pairs/ipairs 2021-03-16 17:35:46 +01:00
AFCMS
bd9713ab50 fix double calling setting in hudbars globalstep 2021-03-15 01:33:28 +01:00
AFCMS
e069962c48 quick fix 2021-03-14 21:59:14 +01:00
kay27
f3fb80200d Revert "Fix XP bar overflow if trying to go over XP limit", please see https://git.minetest.land/MineClone2/MineClone2/issues/1261
This reverts commit f6f2037e6a.
2021-03-06 23:07:16 +04:00
Elias Fleckenstein
d57db0444f Use mod.conf in all mods, part 1 2021-03-04 15:22:14 +01:00
kay27
6f2f427777 fix a typo 2021-02-27 23:31:01 +04:00
kay27
bf81bb7f07 Translatable archievement chat messages 2021-02-27 22:16:29 +04:00
Elias Fleckenstein
311e1b74a3 Merge pull request 'Fix French translations' (#1211) from pitchum/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1211
2021-02-27 13:44:32 +00:00
Elias Fleckenstein
68ac84da83 Proper archievement chat messages 2021-02-27 14:51:50 +01:00
pitchum
d0e789daf2 More fixes in French translations 2021-02-27 13:43:57 +01:00
pitchum
b0f389eb9f Fix French translations for 'Achievement gotten' 2021-02-27 12:15:33 +01:00
Elias Fleckenstein
37ef792c9d Fix #1192 2021-02-26 09:38:02 +01:00
kay27
c1880d26c8 Fix awards logging 2021-02-26 02:58:53 +04:00
kay27
23a023d87d Fix https://git.minetest.land/MineClone2/MineClone2/issues/183 2021-02-26 02:56:46 +04:00
Elias Fleckenstein
51ace85d4e Enable 3D player preview by default now that MT 5.4 is released 2021-02-25 09:52:08 +01:00
Elias Fleckenstein
2d4b8a8232 Replace usages of get_node_group by get_item_group 2021-02-23 10:25:17 +01:00
Elias Fleckenstein
eb62db441b Merge pull request 'Rewrite all deathmessages so they are more minecraft like.' (#1147) from Code-Sploit/MineClone2_deathmessages_rewrite:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1147
2021-02-22 13:06:53 +00:00
Code-Sploit
89a048e335 Fix another typo 2021-02-22 13:03:32 +00:00
Elias Fleckenstein
86dc33c12f Fix #1150 2021-02-22 11:08:57 +01:00
Code-Sploit
8135110fd4 Fix typo on line 97 2021-02-20 17:41:09 +00:00
Code-Sploit
f5d2a32e6b Change some deathmessages 2021-02-19 13:52:24 +00:00
Code-Sploit
84bfa87fdf Fix some other typo's 2021-02-19 12:12:46 +00:00
Code-Sploit
c4633db21d Fix some typo's 2021-02-19 06:43:50 +00:00
Code-Sploit
ae7c4d7a8b Rewrite all deathmessages 2021-02-18 17:59:44 +00:00
Laurent Rocher
303d286603 Update French translation 2021-02-13 00:09:59 +01:00
Elias Fleckenstein
778ddd555f Move mending code to add_experience function 2021-02-12 09:20:32 +01:00
Elias Fleckenstein
7932f4e470 Disable 3D player preview by default 2021-02-10 18:30:58 +01:00
Elias Fleckenstein
b36db2044f 3D Player preview in inventory 2021-02-08 20:13:08 +01:00
Elias Fleckenstein
89ce072621 Sneak to dismount when in boat 2021-01-28 17:44:55 +01:00
Elias Fleckenstein
467683a7f9 Add experience bottle 2021-01-24 19:46:39 +01:00
Elias Fleckenstein
3d7e89811d Fix #990 2021-01-20 16:14:23 +01:00
Elias Fleckenstein
02305c914d Merge branch 'enchanted_books_creative' 2021-01-18 20:08:37 +01:00
Elias Fleckenstein
5ce1fd6821 Rise XP collection distance 2021-01-07 14:42:19 +01:00
Elias Fleckenstein
8ef14dd81f Fix #872 2021-01-05 17:23:24 +01:00
Elias Fleckenstein
139a4d94d0 Merge branch 'master' into enchanted_books_creative 2021-01-05 14:25:56 +01:00
kay27
6fcf1cf09f Make catching XP orbs easier 2021-01-05 12:21:01 +01:00
kay27
4d54766590 quick fix of https://git.minetest.land/Wuzzy/MineClone2/issues/954 2021-01-05 12:15:43 +01:00
Elias Fleckenstein
dc5ff37449 Fix #954 2021-01-04 20:44:35 +01:00
Elias Fleckenstein
cfc86bcf3d Fix #952 and other occurences of get_player_velocity 2021-01-04 18:06:31 +01:00
Elias Fleckenstein
5939baee52 Enchanted books in creative inventory 2021-01-04 13:02:55 +01:00
kay27
30379c823c Clean up some spaces in code after merging https://git.minetest.land/EliasFleckenstein03/MineClone2 2021-01-03 00:42:07 +04:00
Elias Fleckenstein
84708c3870 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-01-02 10:58:02 +01:00
Wuzzy
e8573189d8 Fix XP bar overflow after enchant 2020-12-28 15:32:24 +01:00
Elias Fleckenstein
3161668d26 Color tweaks 2020-12-22 10:42:22 +01:00
Elias Fleckenstein
e152e346ea Improve XP bar position 2020-12-21 18:27:58 +01:00
Elias Fleckenstein
ef9a54872e Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2020-12-21 17:58:39 +01:00
Elias Fleckenstein
5fe64ff6f1 Better XP bar 2020-12-21 17:02:39 +01:00
Elias Fleckenstein
a4d9d22bb0 Mending 2020-12-21 15:12:24 +01:00
Wuzzy
821af93675 Translate mcl_experience,mcl_enchanting to de 2020-12-19 16:07:34 +01:00
Elias Fleckenstein
6c3588bad8 Rework inventory 2020-12-17 13:29:21 +01:00
Wuzzy
f6f2037e6a Fix XP bar overflow if trying to go over XP limit 2020-12-14 20:04:52 +01:00
Wuzzy
9028902a87 Remove mcl_experience setting 2020-12-14 14:16:09 +01:00
kay27
5da02bb8cc Merge https://git.minetest.land/EliasFleckenstein03/MineClone2 2020-12-13 03:00:04 +04:00
Wuzzy
6f9f7a2cb9 Disable XP by default 2020-12-04 18:46:04 +01:00
Elias Fleckenstein
ed738da016 Added Enchanting Table 2020-11-25 12:47:27 +01:00
Laurent Rocher
af26f18bd6 Complete French Translation 2020-11-18 23:06:47 +01:00
Wuzzy
027b240cac Add object crosshair 2020-11-12 13:51:37 +01:00
Wuzzy
41a1a3167d Fix wielded item text overlapping with HUD 2020-11-12 12:30:00 +01:00
kay27
47c834a809 Fix XP inditaction when the player dies 2020-11-10 11:25:35 +04:00
kay27
38ad237d92 Fix multithreaded addition of XP 2020-10-26 10:24:38 +04:00
kay27
9f98117328 Fix XP and Nether ashes 2020-10-26 01:06:35 +04:00
kay27
c4f038ab77 Final (hopefully) megre of XP to master, sorry for all possible conflicts 2020-10-24 13:48:39 +04:00
Wuzzy
730e5f6998 Some mcl_experience cleanup 2020-10-24 11:42:24 +02:00
Wuzzy
a4c2211d87 Merge branch 'enchanting' of https://git.minetest.land/Wuzzy/MineClone2 into master 2020-10-24 11:38:16 +02:00
kay27
30d9e54803 Implement leftovers of https://git.minetest.land/Wuzzy/MineClone2/issues/841#issuecomment-11440 2020-10-24 02:46:45 +04:00
Wuzzy
5374376e24 Don't play XP sound for negative or 0 XP 2020-10-23 23:35:46 +02:00
Wuzzy
3236dc0d8e Simplify XP bar 2020-10-23 23:30:40 +02:00
Wuzzy
fe1c8ca758 Hard-cap XP at 2^31-1 2020-10-23 23:16:46 +02:00
Wuzzy
53dbd4e2c2 Clean up /xp syntax help 2020-10-23 22:58:13 +02:00
Wuzzy
3fde86eff6 Experience: Clean up HUD elements 2020-10-23 22:50:53 +02:00
kay27
290893355b Implement some of https://git.minetest.land/Wuzzy/MineClone2/issues/841#issuecomment-11440 2020-10-24 00:18:53 +04:00
kay27
a127136c60 Add Enchanting from Crafter-minetest by Oil_boi 2020-10-19 16:38:21 +04:00
kay27
b8caa2581f Update Russian translation of Brewing 2020-08-11 01:59:58 +04:00
Wuzzy
e519c62c8b Clean up more potion-related strings 2020-08-05 15:18:30 +02:00
Wuzzy
49d5e49999 Upgrade hudbars to 2.3.2 2020-07-23 23:06:10 +02:00
kay27
ba51686e6c Russian translation 2020-07-20 00:11:13 +00:00
Wuzzy
c106a62979 Use minetest.is_creative_enabled 2020-07-10 16:45:40 +02:00
Wuzzy
6ba537a096 Merge branch 'translated_creative_search' 2020-07-10 14:03:52 +02:00
Brandon
1d471c52df Remove potion effects by drinking milk. 2020-06-28 12:16:07 -04:00
Brandon
44ee9cde86 Add potions/brewing to creative inventory 2020-06-28 09:38:06 -04:00
Wuzzy
95b3b4a172 Add empty smoke_puff.png 2020-05-21 01:54:55 +02:00
Wuzzy
c156398fb5 Merge branch 'translate-fr' of https://git.minetest.land/lrocher/MineClone2 into translate_fr 2020-05-09 18:57:40 +02:00
Rocher Laurent
c9a37d0dbc Translate In French 2020-05-05 21:02:21 +02:00
Rocher Laurent
4957bd1118 Translate In French 2020-05-03 22:39:07 +02:00
Wuzzy
6a576c50a0 Add puncher to tnt_explosions 2020-05-02 18:24:53 +02:00
Wuzzy
d4bc7a2f88 Add back the explosion death msg 2020-05-02 18:09:25 +02:00
Wuzzy
98988b1636 Fix creative search not take transl. into account 2020-04-25 14:31:01 +02:00
Wuzzy
6a77a54034 Increase z_index values to match new convention 2020-04-17 21:27:45 +02:00
Wuzzy
f27615d77e Add z_index to HUD elements 2020-04-07 13:03:10 +02:00
Wuzzy
c5e4ec5e27 Use ephemeral sounds 2020-04-07 00:55:45 +02:00
Wuzzy
d8cb7a7164 Add achievement chat command 2020-03-30 21:11:45 +02:00
Wuzzy
da1c3f635c Revert "Add dummy inventory images for backwards-compat"
This reverts commit 73d93ae969.
2020-03-29 14:38:39 +02:00
Wuzzy
73d93ae969 Add dummy inventory images for backwards-compat
In 0.60.0, the inventory rendering of nodes was changed, so images were removed. This caused missing image errors with *existing* node formspecs, however, so empty dummy images are added back.
2020-03-29 14:05:59 +02:00
Wuzzy
7243a25fe6 Generate item slot images on the fly 2020-03-24 18:48:14 +01:00
wuniversales
3772dd51cc Update Spanish translation 2020-03-15 08:32:00 +01:00
Wuzzy
242b880c4f Make creative arrows white 2020-03-10 10:22:38 +01:00
Wuzzy
9422989ac6 Redraw Creative trash slot 2020-03-10 07:36:42 +01:00
Wuzzy
6761ebdae5 Fix shading of lower tabs in Creative inv. 2020-03-10 06:38:53 +01:00
Wuzzy
60effa71b4 Inventory: Translate page counter 2020-03-10 06:13:52 +01:00
Wuzzy
1e5f3ee610 Creative: Replace fake slider with page buttons 2020-03-10 06:11:49 +01:00
Wuzzy
3bcb868f8b Remove unused awards images 2020-03-10 05:10:48 +01:00
Wuzzy
03ad3cca29 Major default formspec style update
- Uses formspec_prepend to set e.g. button style
- Make all formspecs use the MCL2 style consistently
2020-03-10 05:01:49 +01:00
Wuzzy
0e867e5247 Fix creative tab styling for future MT 5.2.0 2020-03-10 00:15:54 +01:00
Wuzzy
329452d5ce Don't show armor bar for 0 armor 2020-02-18 20:10:35 +01:00
Wuzzy
fb251db925 Rename mod: 3d_armor → mcl_armor 2020-02-18 15:44:54 +01:00
Wuzzy
bef99ac211 Rename mod: hbarmor → mcl_hbarmor 2020-02-17 20:24:26 +01:00
Wuzzy
e3b68c4364 Display armor points properly 2020-02-17 20:19:07 +01:00
Wuzzy
988ca6ffe7 Interpret many damage sources as punches 2020-02-17 18:37:23 +01:00
Wuzzy
377bf31c5d Fix crash when killing player with dispenser arrow 2020-02-05 02:40:07 +01:00
Wuzzy
3836f1b7e9 Update hudbars mod to 2.1.0 2020-02-04 22:06:31 +01:00
wuniversales
15481cb24d Add Spanish translation 2020-02-04 21:43:50 +01:00
Wuzzy
05152589fa Fix crash in awards mod 2020-01-06 11:24:28 +01:00
Wuzzy
01eb39b62f Remove awd and awpl commands 2020-01-06 11:20:14 +01:00
Wuzzy
2ff5bafd91 Refactor mob projectiles 2019-12-10 01:01:04 +01:00
Wuzzy
e2fb3a562d Add some arrow-related death messages 2019-12-09 10:11:15 +01:00
Wuzzy
25e2bd106f Re-enable cookFish achievement 2019-09-11 13:56:52 +02:00
Wuzzy
da5b2443f2 Fix crash when players kill each other 2019-03-19 08:43:11 +01:00
Wuzzy
9cef74c03b Replace GUI image texts with translatable labels 2019-03-16 05:21:27 +01:00
Wuzzy
805fa76282 Inventory: Translate tab captions 2019-03-16 04:04:41 +01:00
Wuzzy
550fa39d86 Make achievements translatable 2019-03-16 03:36:32 +01:00
Wuzzy
af4aa6c2ec Change German translation of Shulker 2019-03-16 00:21:17 +01:00
Wuzzy
3f85e1c0da Fix lava/fire/magmablock death message not transl. 2019-03-15 07:23:36 +01:00
Wuzzy
41842c73c6 Fix translations in mcl_death_messages not working 2019-03-14 08:33:28 +01:00
Wuzzy
293dd036f8 German translations: HUD 2019-03-14 01:51:52 +01:00
Wuzzy
9405232fef Clean up awards mod translation 2019-03-14 01:14:39 +01:00
Wuzzy
5aeb4aea74 Add translation templates for most mods
Using the findtext.lua script
2019-03-13 23:40:59 +01:00
Wuzzy
2b586549cf Add translation templates for 3 mods 2019-03-13 22:52:14 +01:00
Wuzzy
d25e9ec4cc Re-introduce the progressive mode! YESSSSS 2019-03-13 04:52:23 +01:00
Wuzzy
ac7a16eb96 Update to latest version of craftguide 2019-03-12 22:03:21 +01:00
Wuzzy
b551b144d4 Disable translator of mcl_achievements 2019-03-12 13:33:26 +01:00
Wuzzy
086b29f08c Fix minor race condition in mcl_death_messages 2019-03-08 22:51:35 +01:00
Wuzzy
049c632276 Generalize node damage death message 2019-03-08 21:59:16 +01:00
Wuzzy
20576431e1 More death messages, more reliable 2019-03-08 20:22:01 +01:00
Wuzzy
1cb142ec5f Fix crasher in mcl_inventory 2019-03-07 22:01:45 +01:00
Wuzzy
0d6610dcee New translation system, part 3: HUD 2019-03-07 21:36:06 +01:00
Wuzzy
3edf880301 Add minimal formspec prepend 2019-03-07 13:05:26 +01:00
Wuzzy
a84f7935fa Revert "Utilize formspec prepend"
This reverts commit ea0c2e9568.
2019-03-07 12:42:08 +01:00
Wuzzy
720bc6a56f Revert "Move mcl_formspec_prepend"
This reverts commit 581f0fa2dd.
2019-03-07 12:41:59 +01:00
Wuzzy
5e5dcfaaa3 Tweak scrollbar in creative inventory 2019-03-06 08:40:04 +01:00
Wuzzy
581f0fa2dd Move mcl_formspec_prepend 2019-03-06 07:32:13 +01:00
Wuzzy
ea0c2e9568 Utilize formspec prepend 2019-03-06 06:35:24 +01:00
Wuzzy
c4558a31ab Update modpack meta files (MT 5.0.0) 2019-03-06 05:52:31 +01:00
Wuzzy
2f74aea6f5 Replace deprecated functions 2019-03-06 04:38:57 +01:00
Wuzzy
c84656f85a Add fancy GUI to select skin 2019-03-05 13:50:35 +01:00
Wuzzy
e47bd634d4 Player skins: Update inventory preview (part 2) 2019-03-05 10:30:34 +01:00
Wuzzy
2c5038ad05 Player skins: Adjust inventory preview image, too 2019-03-05 01:50:51 +01:00
Wuzzy
a711c7bdb7 handle_node_drops no longer destroys metadata 2019-03-01 17:30:21 +01:00
Wuzzy
77709c8076 Disable fish achievement 2019-02-07 06:35:32 +01:00
Wuzzy
069f3591e2 Add mobs page in creative inventory 2019-02-06 11:31:04 +01:00
Wuzzy
66c99efb2f Hide "useless" items from creative and craft guide 2019-02-06 10:57:23 +01:00
Wuzzy
4f2cd559da Rename textures that clash with MTG
cactus, hotbar, some wools
2019-02-04 12:21:58 +01:00
Wuzzy
e789801662 Replace getpos() with get_pos() 2019-02-01 06:33:07 +01:00
Wuzzy
68c373d2b8 Add a couple of modpack.conf files 2019-01-07 00:52:05 +01:00
Wuzzy
f022b747b0 Harden a number of minetest.after player checks 2018-06-03 16:44:37 +02:00
Wuzzy
fff3eb1ee7 Rename mcl_autogroup to _mcl_autogroup
This should fix some autogroup-related issues due to loading order.
2018-05-08 16:43:25 +02:00
Wuzzy
5ca5811bc8 Refactor how the misc creative category works 2018-05-08 15:58:26 +02:00
Wuzzy
4be5f89829 Move bow/arrow logic into new mod mcl_bows 2018-05-07 23:10:49 +02:00
Wuzzy
dd4008ea73 Add totem of undying into combat category 2018-01-25 22:01:19 +01:00
Wuzzy
05c324748f Slightly shift search field in Creative inventory 2017-12-11 04:04:32 +01:00
Wuzzy
2b9f37b3e8 Add death messages for kill from baby mobs 2017-12-03 11:23:37 +01:00
Wuzzy
eed223b3fe Tweak tab positions in Creative 2017-11-21 23:23:56 +01:00
Wuzzy
620d8a7804 Fix previous creative inventory button not working after death 2017-11-18 09:03:49 +01:00
Wuzzy
aaef558909 Convert all sounds (except music) to mono 2017-11-13 01:24:24 +01:00
Wuzzy
664499313e Generalize Nether portal achievement description 2017-09-19 20:06:57 +02:00
Wuzzy
f51c8c75ba Update hudbars mod to 1.10.0 2017-09-19 17:20:47 +02:00