Commit Graph

13099 Commits

Author SHA1 Message Date
Christof Petig
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master'
wyverns

See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Isse
c5ea47f868 Merge branch 'isse/mod-badge' into 'master'
Moderator chat badge

See merge request veloren/veloren!3781
2023-01-28 02:44:43 +00:00
Isse
aefead4a31 fmt 2023-01-28 03:10:43 +01:00
Isse
a5248bd61a Add to changelog 2023-01-28 03:10:42 +01:00
Isse
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
Isse
0543c265c8 Merge branch 'veloren-poggly/chat_cmd_suggestion_and_links' into 'master'
[ #1286] Chat command suggestions + Fixing /help + code refactor

See merge request veloren/veloren!3699
2023-01-28 02:06:23 +00:00
Ellen Sun
d774319cf0 cleanup and fixes + added change to CHANGELOG.md 2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00
poggly
75ccd65ec6 initial commit, todo comment and realphabetized ServerChatCommand enum 2023-01-27 20:31:56 -05:00
Marcel
436453556b Merge branch 'Teffmasterjeff/update-ko_KR' into 'master'
Update the Korean translation

See merge request veloren/veloren!3777
2023-01-26 22:54:02 +00:00
Marcel
802ca9b532 Merge branch 'vasco/buff-potionsickness' into 'master'
Italian translation: buff-*-potionsickness

See merge request veloren/veloren!3780
2023-01-26 15:08:23 +00:00
Joshua Barretto
ebcb986461 Merge branch 'Corvella/small_fixes' into 'master'
Correctly apply LoD distance setting and improve documentation on projectile fixes

Closes #1779

See merge request veloren/veloren!3779
2023-01-26 14:27:59 +00:00
Corvella
dcd3fb2077 Correctly apply LoD distance setting and improve documentation on projectile fixes 2023-01-26 14:27:59 +00:00
Francesco Vasco
2843852457 Italian translation: buff-*-potionsickness 2023-01-26 12:36:45 +01:00
Marcel
91d0227c1b Merge branch 'jdbp/update_es_ES_translation' into 'master'
feat(i18n): update the Spanish (Castilian) translation

See merge request veloren/veloren!3773
2023-01-26 08:10:17 +00:00
Marcel
8aea1bffc1 Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3778
2023-01-26 08:06:32 +00:00
tygyh
4159ea5b48 Update swedish translations 2023-01-24 16:56:12 +01:00
walpo
4502b2fd68 feat(i18n): update the Spanish (Castilian) translation
The Spanish translation (es_ES) has "Unused" and "NotFound" strings that need to be fixed
2023-01-24 15:21:25 +01:00
Marcel
1904740ffd Merge branch 'niniko/update-fr_FR' into 'master'
Update the French translation

See merge request veloren/veloren!3764
2023-01-24 08:49:18 +00:00
Joshua Barretto
88ac238121 Merge branch 'joedonofry/dropped_lantern_glow' into 'master'
Add glow to dropped lanterns

See merge request veloren/veloren!3772
2023-01-23 16:13:43 +00:00
Joseph Donofry
74ee861dde Add glow to dropped lanterns 2023-01-23 16:13:43 +00:00
Zaixun
c02015c6c3 Update the Korean translation 2023-01-23 00:32:21 -07:00
Isse
05dd34e1e8 Merge branch 'isse/update-dot-vox-dependency' into 'master'
Update dot_vox dependency

See merge request veloren/veloren!3776
2023-01-22 22:22:02 +00:00
Isse
ec73d136b4 Merge branch 'isse/fix-armor-diff' into 'master'
Fixed armor stat diff display

See merge request veloren/veloren!3774
2023-01-22 22:19:21 +00:00
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01:00
Isse
709b6a9aae Fixed armor stat diff display 2023-01-21 02:40:32 +01:00
Joshua Barretto
75e07c04f0 Merge branch 'zesterer/glowing-sprites' into 'master'
Added support for glowing sprites

See merge request veloren/veloren!3771
2023-01-19 22:31:30 +00:00
Marcel
25c8eb8444 Merge branch 'potion-sickness' into 'master'
Implement potion sickness, which causes diminishing returns on healing from potions.

See merge request veloren/veloren!3756
2023-01-19 22:06:07 +00:00
Joshua Barretto
d9552f7ff4 Added support for glowing sprites 2023-01-19 21:59:02 +00:00
Avi Weinstock
1cf74cecdb Allocate the correct number of widget ids for multiplicity icons. 2023-01-19 15:06:14 -05:00
Avi Weinstock
aba6f6654e Add a new particle mode for potion sickness. 2023-01-19 15:06:14 -05:00
Avi Weinstock
dc6e61983c Make potion sickness's healing multiplier only affect potions. 2023-01-19 15:06:13 -05:00
Avi Weinstock
060b8cc0ec Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea. 2023-01-19 15:06:13 -05:00
Avi Weinstock
adaf8ef6f4 Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs. 2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness. 2023-01-19 15:06:13 -05:00
Avi Weinstock
a871d3880b Address MR 3756 review comments. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Joshua Barretto
da9cd79973 Merge branch 'zesterer/canary' into 'master'
Added canary asset

See merge request veloren/veloren!3770
2023-01-18 23:02:07 +00:00
Joshua Barretto
63d0c937f0 Removed existing LFS check 2023-01-18 22:31:33 +00:00
Joshua Barretto
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
Marcel
d7315bac5e Merge branch 'vasco/hud-skill-set_as_exp_bar' into 'master'
Fix label size of "set as exp bar" checkbox

Closes #1778

See merge request veloren/veloren!3766
2023-01-18 19:29:33 +00:00
Marcel
3a186caf5e Merge branch 'vasco-stamina-energia' into 'master'
Italian: stamina -> energia

See merge request veloren/veloren!3750
2023-01-18 18:53:51 +00:00
Marcel
105dbc77ee Merge branch 'nixda/Energy_regeneration' into 'master'
#1694 Faster Energy Regeneration-acceleration while sitting

See merge request veloren/veloren!3768
2023-01-18 15:58:25 +00:00
Marcel
a235bab644 Merge branch 'nixda/climbing_text_fix' into 'master'
#1758: fixed in German and English(Replaced Jumping with Climbing)

See merge request veloren/veloren!3765
2023-01-18 15:58:23 +00:00
Isse
09cea6aca9 Merge branch 'nixda/trading_message_fix' into 'master'
#1725 do not clear target during trading.

See merge request veloren/veloren!3767
2023-01-18 13:55:54 +00:00
Nils Ascheuer
21f417dbef Added Changelog 2023-01-18 14:40:21 +01:00
Nils Ascheuer
f9e1aca045 #1694 Faster Energy Regeneration-acceleration while sitting 2023-01-18 10:44:09 +01:00