Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-12 19:49:32 +01:00
Code Issues Projects Releases Packages Wiki Activity
12658 commits 114 branches 83 tags 178 MiB
Commit graph

683 commits

Author SHA1 Message Date
cora
232f57c247 Add hero of the village achievement 2022-11-26 17:06:04 +01:00
cora
53c1ed9fbf Merge pull request 'Axolotl' (#2870) from TheOnlyJoeEnderman/MineClone2:Axolotl into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2870
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-23 03:18:36 +00:00
PrairieWind
fb651a4922 Wax On and Wax Off Advancements 2022-11-17 03:16:45 +01:00
PrairieWind
bbb908239b Total Beelocation Advancement 2022-11-17 03:16:45 +01:00
PrairieWind
0aaaa05164 Bee Our Guest Advancement 2022-11-17 03:16:45 +01:00
erlehmann
94960b64d4 Fix creative mode inventory search crash 
Before this patch it was possible for any user to to crash Minetest in
creative mode. This was possible because queries in the search field
were interpreted as search patterns for string.find().

A search for a single square bracket would reliably crash the server.
Also, a search for 6000 times the string “a?” would hang the server.

The solution to both bugs is to not interpret the query as a pattern.
 2022-11-15 04:41:01 +01:00
MysticTempest
6a0bcf9881 Fix insta-digging crash when punching stairs. 2022-11-09 04:26:41 -06:00
MysticTempest
2be75c9628 Better fix for creative digging drops, and fix the itemframes LBM. 2022-11-06 07:08:49 -06:00
TheOnlyJoeEnderman
8e74209c9b add axolotl to translation template 2022-11-04 02:32:59 +00:00
chmodsayshello
e9703c409e correct if/else in line 42 2022-10-31 21:53:51 +00:00
chmodsayshello
c572c27326 implement suggestions by cora (https://is.gd/jJRf3y) 2022-10-31 21:40:38 +00:00
chmodsayshello
c1af4935a1 improve my poor (old) fix 2022-10-31 16:22:28 +01:00
chmodsayshello
910b3d57ac fix crash iteself 2022-10-31 16:19:38 +01:00
TheOnlyJoeEnderman
2d7d577f31 Add Cutest Predator advancement 2022-10-29 04:20:13 +00:00
TheOnlyJoeEnderman
0fc09c6e89 revert 0ab82b5317 
revert add cutest predator advancement, Fix accidental deletions.
 2022-10-29 04:05:26 +00:00
TheOnlyJoeEnderman
b1355513dd Merge branch 'master' into Axolotl 2022-10-28 07:18:37 +00:00
TheOnlyJoeEnderman
0ab82b5317 add cutest predator advancement 2022-10-26 20:33:41 +00:00
cora
05bd2b0e83 Update end credits again 2022-10-23 15:59:24 +02:00
cora
1ffcc98ba8 Update end credits 2022-10-23 15:59:23 +02:00
cora
e6aeb9ffba Use dig_node instead of remove in creative dig 2022-10-18 11:42:56 +02:00
cora
efcd0c8dcc Merge pull request 'Fix boss bars scaling issue with non 16x texture packs' (#2767) from talamh/MineClone2:bossbars_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2767
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-10-15 23:04:53 +00:00
talamh
07e419905b Fixed typo in image resizing in bossbars 2022-10-13 20:02:28 +01:00
talamh
f1ebe802c6 Fix boss bars scaling issue with non 16x texture packs 2022-10-12 19:37:56 +01:00
talamh
7cf287a504 Fix exp bar scaling issue with non 16x textures 2022-10-11 19:52:30 +01:00
FossFanatic
e35e949833 Add breaking animation by FossFanatic 2022-10-11 11:40:15 +02:00
PrairieWind
78f1a81d1f Add Advancement Groups (Overworld, Nether, End, Adventure, Husbandry) 2022-10-10 01:10:49 +02:00
PrairieWind
0a33c5b5df Added Types of Advancements (Advancements, Goals, and Challenges) 2022-10-10 01:10:49 +02:00
PrairieWind
f9f74d2af7 Changed Achievements to Advancements in player visible text. 2022-10-10 01:10:49 +02:00
cora
2a9d704293 Fix dumb mistake in creative crash fix 2022-10-10 01:07:11 +02:00
cora
a1919b572a Fix crash in 5.6 gm-creative digging 2022-10-10 00:52:55 +02:00
cora
52ac8ffd43 clarify debug nature of chatcommands 2022-10-09 21:31:23 +02:00
cora
3686d9a79d Enable mcl_title debug code, debug priv to chatcmds 2022-10-08 22:56:40 +02:00
AFCMS
d71d1c4b82 mcl_title API: enable styling 2022-10-08 22:46:32 +02:00
cora
3b92a5b0d2 Merge pull request 'Fix offhand hud slot incorrect scaling with non 16x texture packs' (#2725) from talamh/MineClone2:offhand_hud into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2725
 2022-10-07 00:17:18 +00:00
talamh
ecd1162c2d Fix offhand hud slot incorrect scaling with non 16x texture packs 2022-10-06 21:15:15 +01:00
talamh
b4859b8e7c Replace bed nodeboxes with meshes 2022-10-06 17:36:51 +01:00
cora
6da1491f14 make xp.throw_xp return the orb objects 2022-10-06 00:31:00 +02:00
PrairieWind
f0d5080df7 Fixed Free the End advancement icon 2022-10-03 10:31:10 -06:00
Johannes Fritz
18f8768909 Fix invisibility potion when changing skin 2022-09-15 12:04:20 -05:00
cora
661758040e Update credits again 2022-09-14 23:13:47 +02:00
cora
5d530499a4 update credits 2022-09-14 23:11:43 +02:00
PrairieWind
ede968b571 Free The End Advancement 2022-09-14 20:37:08 +00:00
PrairieWind
d74e61d8b2 Sky's the Limit Advancement 2022-09-14 20:37:08 +00:00
PrairieWind
644e71f0ee The End...Again... Advancement 2022-09-14 20:37:08 +00:00
PrairieWind
404f623527 The Next Generation Advancement 2022-09-14 20:37:08 +00:00
cora
e0abc7515d Prevent possible crashes in creative dig and place 2022-09-14 14:48:42 +02:00
cora
8fbe770cee Don't subtract items when placing in gm-creative 2022-09-14 00:52:23 +00:00
cora
c7045bc415 Instadig nodes on punch in (gamemode) creative 2022-09-13 16:52:53 +00:00
Johannes Fritz
8e6b6393c2 Add advanced skin customization 2022-09-06 12:16:46 -05:00
3raven
6da876b573 Mise à jour de 'mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr' 2022-08-23 21:34:57 +00:00
3raven
ea412309f5 correction 2022-08-23 21:33:18 +00:00
3raven
ab3e56d2f7 Match template 2022-08-23 16:20:44 +00:00
3raven
5dfb64dcc9 Remove doublon 2022-08-23 16:10:26 +00:00
3raven
9648edb173 Doublon 2022-08-23 16:04:55 +00:00
3raven
adcb2b8c19 Complete & correct translation 2022-08-23 15:38:09 +00:00
3raven
0f06868c5f Add translation 2022-08-23 15:24:56 +00:00
3raven
10e09baeaa Match template 2022-08-23 15:20:32 +00:00
3raven
1e8ddf3ab8 Add translations 2022-08-23 03:41:51 +00:00
chmodsayshello
7ee38fef83 update credits (again) 2022-08-15 14:08:59 +00:00
cora
9603ee606c fix at mod loadtime warning in mcl_info 2022-08-10 14:14:00 +02:00
chmodsayshello
dd9e6e5d6b mesh by Sumi 2022-07-31 22:22:56 +02:00
chmodsayshello
a5e1a00cd8 Use overlay properly in mcl_achievements 2022-07-31 22:22:56 +02:00
chmodsayshello
f7028bc836 'fix' beacon texture 2022-07-31 22:22:56 +02:00
chmodsayshello
74e3dfa0d7 beacon related achievements 2022-07-31 22:22:56 +02:00
PrairieAstronomer
f84063ad0a Withering Heights Advancement 2022-07-25 11:48:38 -06:00
cora
37114e7d1a Add API documentation 2022-07-19 11:15:08 +02:00
cora
ac45ed8a0a coord and biome use api too, fields well ordered 2022-07-19 11:15:08 +02:00
cora
7e6daa0e60 Add api to register custom debug fields 
also add node info as first fields
 2022-07-19 11:15:08 +02:00
cora
39b9a058e9 Save persistent setting in player meta 2022-07-19 11:15:08 +02:00
cora
00ef88e01c fix mistakes from mcl5 import, clean up output 2022-07-19 11:15:08 +02:00
kay27
d5b2e60e32 #278 Rename default_dbg to default_debug 2022-07-19 11:15:08 +02:00
kay27
cb2852e88f #233 Add /debug chat command 2022-07-19 11:15:08 +02:00
kay27
47719872e4 [hud] Show player biome and position 2022-07-19 11:15:08 +02:00
PrairieAstronomer
27ea6087c7 Tactical Fishing Advancement 2022-07-09 02:30:48 +02:00
PrairieAstronomer
9c3a4f3436 Updated the Advancements translation template...again 2022-07-01 14:54:44 -06:00
PrairieAstronomer
1abeccfaab Enchanter Advancement 2022-07-01 14:50:56 -06:00
PrairieAstronomer
2845cd79b7 Local Brewery Advancement 2022-07-01 14:37:02 -06:00
PrairieAstronomer
4bfadffadc Fixed Minor Formating in Advancement Definitions 2022-07-01 14:04:33 -06:00
PrairieAstronomer
f998f3bc05 Updated Advancements Translation Template 2022-07-01 13:56:44 -06:00
PrairieAstronomer
acff3e525c Changed the Into the Nether achievement to the We Need to Go Deeper Advancement 2022-07-01 13:45:07 -06:00
PrairieAstronomer
6757b8f900 The Nether Advancement 2022-07-01 13:41:21 -06:00
PrairieAstronomer
8f7ac1e5a2 Not Quite 'Nine' Lives Advancement 2022-07-01 13:11:26 -06:00
PrairieAstronomer
40a421ddd0 Hidden in the Depths Advancement 2022-07-01 12:41:01 -06:00
PrairieAstronomer
687bc04560 Who is Cutting Onions? Advancement 2022-07-01 12:39:10 -06:00
PrairieAstronomer
79c014f356 Serious Dedication Advancement 2022-06-30 14:11:13 +02:00
PrairieAstronomer
87a45ad78e Minor Format Detail in Country Lode Advancement 2022-06-11 19:14:28 -06:00
PrairieAstronomer
bbd86045e5 Country Lode, Take Me Home Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
eb72bb81da Fishy Business Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
b544fb819d What A Deal! Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
17e2f05971 Sweet Dreams Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
2a62936fe7 Postmortal Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
91f8f44e17 The End? Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
1a5195b5e6 Isn't It Iron Pick Advancement 2022-06-11 15:35:48 -06:00
NO11
25d847f49f Fix crash when unknown item in offhand slot 2022-05-31 22:43:30 +02:00
cora
ae2860d017 Show/Hide XP-hud immediately after gamemode switch 2022-05-27 19:56:47 +02:00
cora
1127231ca9 Fix crash on non existent xp-hud due to gamemode 2022-05-27 15:06:25 +02:00
Elias Fleckenstein
f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Elias Fleckenstein
e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
cora
d863a6298b fix/simplifiy things from review 2022-05-25 16:36:04 +02:00
cora
2499fe1e83 add complete input validation, better result msgs 2022-05-25 05:43:49 +02:00
cora
f89780695e Add /gamemode command for per player gamemode 2022-05-25 05:43:49 +02:00
Elias Fleckenstein
60c463b8f9
Run tools/generate_ingame_credits.lua 
This should be run every time CREDITS.md is changed.
 2022-05-22 21:41:40 +02:00
AFCMS
3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
chmodsayshello
3699ca5535 update translation template 2022-05-03 15:21:18 +00:00
chmodsayshello
9c652df8a2 update german translation 2022-05-03 14:59:49 +00:00
chmodsayshello
390802a344 fix crash when achievements are disabled and /awards is being used 
This commit fixes  https://git.minetest.land/MineClone2/MineClone2/issues/2164, which crashes the game whenever /awards is called with arguments other than enable
 2022-05-03 14:58:44 +00:00
NO411
db68c0e26b Add shield 2022-03-15 15:58:27 +01:00
AFCMS
096d46152e
make bottle o enchanting activate target 2022-02-26 22:20:05 +01:00
Emojigit
249dfac319 mcl_inventory 2022-02-23 23:58:05 +01:00
Emojigit
bb55120adc mcl_experience 2022-02-23 23:58:05 +01:00
Emojigit
9b15599bee hudbars 2022-02-23 23:58:05 +01:00
Emojigit
410c1ecd1f mcl_hbarmor 2022-02-23 23:58:05 +01:00
NO11
903d1777be Use set_count instead of creating a new item and checking for enchanted books 2021-11-18 17:40:32 +01:00
NO11
9919011aca Fix enchanted books losing their enchantments in creative inventory 2021-11-17 16:43:48 +01:00
NO11
fdaaf0ec49 Use on_joinplayer instead of on_newplayer 2021-11-13 18:56:52 +00:00
NO11
add97d39a6 delete overlay texture 2021-11-13 17:28:13 +00:00
NO11
bcb6251d20 Use label instead of extra texture 2021-11-13 17:26:17 +00:00
NO11
d7e59f6a35 Add switch stack size overlay texture 2021-11-13 12:26:01 +00:00
NO11
d4da855570 Add button to switch between max stack size and just one item 2021-11-13 12:25:10 +00:00
NO11
ae8068cca6 Use stack_max instead of 64 for all items 2021-11-13 11:17:46 +00:00
NO11
5515e2baa1 Add 64 items to inventory when creative is on 2021-11-12 21:49:47 +00:00
Elias Fleckenstein
ea46c8741b
Add OpenCollective link and credits 2021-11-07 20:29:11 +01:00
Elias Fleckenstein
88e084cbca Merge pull request 'Rework XP API' (#1888) from EliasFleckenstein03/MineClone2:xp into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1888
 2021-11-04 13:36:13 +00:00
Elias Fleckenstein
643ded06da
Merge branch 'master' into guidelines 2021-11-03 20:04:08 +01:00
Elias Fleckenstein
a4e73886d5
Rework XP API 2021-11-03 19:36:57 +01:00
Elias Fleckenstein
148575a05b
Remove unused hud_manager.hud_exists function 2021-11-03 16:28:13 +01:00
NO11
5b37f56005 Remove small gray border of buttons in creative inventory pages 2021-10-28 09:43:14 +00:00
Elias Fleckenstein
797da20fa7
Add script to automatically generate ingame credits from CREDITS.md 2021-10-26 13:08:07 +02:00
Wuzzy
1c192f4fbb Do not send useless HUDCHANGE packets 
Several mods set or unset the visibility of a HUD bar way too often (e.g.
in a globalstep handler), causing the server to send a lot of superfluous
HUDCHANGE packets to each client. Returning from hb.hide_hudbar() early
if HUD bar visibility would not change prevents sending these packets.
 2021-09-15 17:47:35 +02:00
AFCMS
af8e88f44c fix error in mcl_title documentation 2021-08-24 08:25:42 +02:00
AFCMS
2d1a43396f Merge pull request 'Title HUD API' (#1778) from title-API into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1778
 2021-08-20 12:31:54 +00:00
AFCMS
df4b8e64cc finish mcl_title API + doc 2021-08-19 19:21:33 +02:00
AFCMS
40898d3e9d WIP bold and italic support 2021-08-16 14:19:50 +02:00
AFCMS
58a292a4f3 fix inconsistency 2021-08-16 13:48:08 +02:00
AFCMS
fe62189019 Update French translation (part 1) 2021-08-13 11:35:18 +02:00
AFCMS
c31c852a6e add documentation 2021-07-20 16:14:34 +02:00
AFCMS
b5f7ae5458 working implementation + support of other mods 2021-07-20 15:47:26 +02:00
AFCMS
9254bab971 Merge branch 'master' into title-API 2021-07-20 15:23:15 +02:00
NO11
f894153b8a Merge pull request 'Fix #1808 (Make end credits speed up when pressing jump)' (#1835) from NO11/MineClone2:credits into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1835
 2021-07-12 13:27:24 +00:00
NO11
848f1489e8 Add german translation 2021-07-11 11:44:00 +00:00
NO11
a0d3f51745 Add template for translations 2021-07-11 11:43:28 +00:00
NO11
46d48ccf2f Add support for translation 2021-07-11 11:42:12 +00:00
NO11
f46c4ebad7 Simplify code 2021-07-11 11:11:22 +00:00
NO11
b7e6db537b Support new credits background 2021-07-10 17:32:01 +00:00
NO11
357474e32f Add better credits background 2021-07-10 17:28:24 +00:00
NO11
b6eb0ab66c Fix #1808 (Make end credits speed up when pressing jump) 2021-07-10 15:12:41 +00:00
AFCMS
8e931e92f5 refactor mcl_title to be more efficient 2021-07-09 11:34:23 +02:00
cora
3b2a25a6cb Merge pull request 'mcl_inventory: Remove _mcl_autogroup dependency from mcl_inventory' (#76) from fix_inventory_depends into master 
Reviewed-on: https://git.minetest.land/Mineclonia/Mineclonia/pulls/76
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2021-07-08 15:20:36 +02:00
AFCMS
2603c4768b mcl_title: basic mc like layout (collide with other mods) 2021-06-07 22:32:05 +02:00
AFCMS
881f0b0a71 Merge branch 'master' into title-API 2021-06-04 19:10:52 +02:00
Marcin Serwin
0132d0569f Update polish translation of several files 2021-06-02 13:21:19 +02:00
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