Commit Graph

13346 Commits

Author SHA1 Message Date
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
Nils Ascheuer
43b61ea6d9 #1725 do not clear target during trading. 2023-01-18 08:15:13 +01:00
Francesco Vasco
ed70bd0800 Italian: "crafting" -> "creazione" 2023-01-17 19:54:32 +01:00
Francesco Vasco
36b68f9f85 Italian: stamina -> energia 2023-01-17 19:53:40 +01:00
Francesco Vasco
4e19b9cdfa Fix label size of "set as exp bar" checkbox 2023-01-17 19:45:04 +01:00
Nils Ascheuer
d703909557 #1758: fixed in German and English 2023-01-17 10:01:10 +01:00
NiniKo
dbb4772fd2 Update the French translation 2023-01-17 09:42:35 +11:00
Marcel
a537d52f48 Merge branch 'james/fix-bats' into 'master'
Make bats easier to combat and fix hitbox scaling bug

See merge request veloren/veloren!3759
2023-01-16 11:34:09 +00:00
Samuel Keiffer
794af29f3e Merge branch 'Corvella/improve_projectile_collision' into 'master'
Improve Projectile/Entity Hit Detection

See merge request veloren/veloren!3763
2023-01-16 05:58:28 +00:00
Corvella
ef5737360b Improve Projectile/Entity Hit Detection 2023-01-16 05:58:28 +00:00
James Melkonian
9d31baf500 Make bats easier to combat and fix hitbox scaling bug 2023-01-15 16:25:43 -08:00
Joshua Barretto
696b575611 Merge branch 'zesterer/graphics-fixes' into 'master'
Fixed rain drop normals and wind direction for sprites

See merge request veloren/veloren!3762
2023-01-15 19:52:04 +00:00
DaforLynx
43fe0ed9b5 Merge branch 'thanosfisherman/a_peaceful_moment_improved' into 'master'
Minor soundtrack improvements.

See merge request veloren/veloren!3761
2023-01-15 19:15:59 +00:00
Thanos Psaridis
2bf23b26a0 Minor soundtrack improvements. 2023-01-15 19:15:59 +00:00
Joshua Barretto
c12e6426fa Fixed rain drop normals and wind direction for sprites 2023-01-15 19:13:18 +00:00
Joshua Barretto
295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master'
autodelete of summoned sprites

See merge request veloren/veloren!3735
2023-01-15 18:28:38 +00:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
Marcel
20610bae23 Merge branch 'jdbp/update_font_file' into 'master'
fonts: add missing characters to a font file and include its license

See merge request veloren/veloren!3757
2023-01-15 16:04:34 +00:00
Isse
f635767866 Merge branch 'isse/fix-doors' into 'master'
Fix doors

See merge request veloren/veloren!3760
2023-01-15 05:13:02 +00:00
Isse
5378d1b11d Fix doors 2023-01-15 05:13:02 +00:00
Samuel Keiffer
f428cdd40c Merge branch 'fix-wall-cheese' into 'master'
Fix wall cheese

See merge request veloren/veloren!3758
2023-01-14 15:41:07 +00:00
flo
98c1e68209 Fix wall cheese 2023-01-14 15:41:07 +00:00
jdbp
509f786a7c font: add license of existing font file
The font license is stated here:
https://fontstruct.com/fontstructions/show/330387/haxrcorp_4089_cyrillic_altgr
2023-01-14 01:34:19 +01:00
walpo
6875de439b haxrcorp_4089_cyrillic_altgr_extended.ttf: add missing characters 2023-01-14 01:25:26 +01:00
Joshua Barretto
47edca8740 Merge branch 'zesterer/graphics-fixes' into 'master'
Fixed internal water reflections and improved underwarper

See merge request veloren/veloren!3754
2023-01-13 17:30:04 +00:00
Marcel
beb934a677 Merge branch 'floppy_dark_guitar&icy_talharpa' into 'master'
dark_guitar & icy_talharpa

See merge request veloren/veloren!3753
2023-01-13 13:37:45 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
Joshua Barretto
fc564f5313 Fixed internal water reflections and improved underwarper 2023-01-13 11:37:27 +00:00
Joshua Barretto
b127cff26c Merge branch 'zesterer/gbuffers-ssr' into 'master'
Use normal and material gbuffer to improve quality of SSR

See merge request veloren/veloren!3734
2023-01-12 20:26:41 +00:00
Joshua Barretto
49749c86a7 Made emissive figures behave correctly 2023-01-12 18:44:26 +00:00
Marcel
ded7317b19 Merge branch '0.14_bg' into 'master'
Add 0.14 background image

See merge request veloren/veloren!3749
2023-01-12 17:56:50 +00:00
Monty Marz
e21e4a6dd4 Add 0.14 background image 2023-01-12 17:56:50 +00:00
Joshua Barretto
4d7526b920 Made point shadows with shadow mapping an experimental shader 2023-01-12 15:39:11 +00:00
Joshua Barretto
0bdc66b10a Addressed review comments, minor fixes 2023-01-12 15:30:13 +00:00