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

482 Commits (6102bf7813cabb3f30e21db39efe57f2e41ec599)

Author SHA1 Message Date
Marcin Serwin a0d3e92b70 Update polish translation of mcl_death_messages 2021-06-02 13:08:39 +02:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS b9fd1ac227 credit digminecraft for the tutorial 2021-06-02 11:12:15 +02:00
AFCMS 7e64470f70 fix future API usage of bold+italic pr 2021-06-02 11:07:31 +02:00
AFCMS c8102838cb add missing TODO entry (bold+italic) 2021-06-02 00:26:10 +02:00
AFCMS 6b53dda79b add todo list 2021-06-02 00:25:15 +02:00
AFCMS 640b0dc485 basic title API working (testing needed) 2021-06-02 00:23:11 +02:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
Marcin Serwin 362965f8fb Add polish translation of mcl_hbarmor 2021-05-28 17:32:48 +02:00
Marcin Serwin 1de0009cc6 Add missing polish translation of mcl_achievements 2021-05-28 17:32:38 +02:00
AFCMS 5f82e76862 fix many codestyle issues 2021-05-28 00:34:58 +02:00
Elias Fleckenstein 079cedaa34 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-26 20:48:07 +02:00
Elias Fleckenstein 1b0d6a2c2d Fix timing out of assist death message sources 2021-05-26 20:48:00 +02:00
AFCMS 5fc3256930 fix codestyle in mcl_hbarmor 2021-05-26 16:55:32 +02:00
AFCMS ee9577b625 fix functions in mcl_hbarmor 2021-05-26 16:43:36 +02:00
AFCMS fd387a65af fix some codestyle issues in hudbars 2021-05-26 16:42:12 +02:00
Marcin Serwin 4a396fde2c Add polish translation of mcl_inventory 2021-05-26 10:11:55 +02:00
Marcin Serwin a4c21de153 Add polish translation of mcl_experience 2021-05-26 10:11:55 +02:00
Marcin Serwin a27833a0e1 Add polish translation of mcl_achievements 2021-05-26 10:11:55 +02:00
Marcin Serwin d83c29f0c4 Add polish translation of awards 2021-05-26 09:08:44 +02:00
Marcin Serwin 2873c7f7ce Add polish translation of mcl_hudbars 2021-05-26 08:49:40 +02:00
Marcin Serwin e797a4ec9b Add polish translation of mcl_death_messages 2021-05-25 22:14:26 +02:00
AFCMS 388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS ce9258b764 [awards] fix warnings 2021-05-23 13:43:59 +02:00
AFCMS 8536e2c033 [mcl_experience] fix warnings 2021-05-23 13:33:36 +02:00
AFCMS 8baea02f24 [mcl_inventory] fix warnings 2021-05-23 13:20:00 +02:00
AFCMS 3fbcacac3b [show_wielded_item] fix warnings 2021-05-23 11:50:58 +02:00
Elias Fleckenstein 04436ea5f7 Fix that fucking mending armor crash 2021-05-18 16:34:20 +02:00
NO11 7e132866bf Update my credits in mcl_credits 2021-05-10 19:47:51 +00:00
Elias Fleckenstein f53ff8418f mcl_damage: HP check guard in non-modifier on_hpchange callback and usage of raw tostring for deactivated objects for death messages 2021-05-05 13:24:23 +02:00
Elias Fleckenstein f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
kay27 7e3dd715af Fix https://git.minetest.land/MineClone2/MineClone2/issues/1681 by @cora 2021-04-30 16:51:34 +04:00
Elias Fleckenstein 7be749a122 Update mcl_awards translations 2021-04-29 12:40:18 +02:00
NO11 32c03dc27e new object overlay 2021-04-28 17:55:03 +00:00
NO11 3195df3864 remove object crosshair 2021-04-28 17:53:40 +00:00
Elias Fleckenstein 97e69e04aa Implement assist death messages 2021-04-25 17:49:27 +02:00
Elias Fleckenstein aeaec68c1b Update german translations for mcl_death_messages 2021-04-25 17:11:47 +02:00
Elias Fleckenstein 302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
Elias Fleckenstein 4c25091430 Fix syntax error in mcl_inventory 2021-04-19 19:12:32 +02:00
Elias Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
Elias Fleckenstein 20a4e038f5 Fix crash when slain by named mob 2021-04-19 17:40:50 +02:00
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