Commit Graph

4002 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
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
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
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
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
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
flo
98c1e68209 Fix wall cheese 2023-01-14 15:41:07 +00:00
Marcel
2ff24259be Merge branch 'zesterer/lod-models' into 'master'
New LoD model, wind sway pays attention to wind velocity

See merge request veloren/veloren!3739
2023-01-02 14:51:00 +00:00
Matas Minelga
3850d3e86e
Inventory sorting MR fixes and slight improvements 2023-01-01 02:36:03 +02:00
Joshua Barretto
f48e1ca951 Make wind sway change according to weather wind velocity 2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category 2022-12-31 02:32:41 +02:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01:00
Isse
ef2c1633ed Merge branch 'isse/bridges' into 'master'
Bridges

See merge request veloren/veloren!3680
2022-11-30 15:07:03 +00:00
Marcel Märtens
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
Marcel Märtens
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
Marcel
2f990fb06e Merge branch 'holychowders/store_last_known_pos' into 'master'
Store Target's Last Known Position

See merge request veloren/veloren!3698
2022-11-20 22:38:14 +00:00
holychowders
61aa49fa66 Add last_known_pos to Target struct. 2022-11-16 18:26:07 -06:00
Samuel Keiffer
5709427e63 Merge branch 'sam/small-fixes' into 'master'
Small fixes for sword

See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit

See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Eternalisime
71e59e4b81 combat: tweaks and modified shockwave animation 2022-11-13 22:04:00 +01:00
Sam
4784b61656 Small fixes 2022-11-13 14:03:37 -05:00
Samuel Keiffer
1173c8257f Merge branch 'holychowders/agent_awareness2' into 'master'
Rework internal representation of agent awareness

See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
holychowders
95fd092e26 Fix awareness changes. 2022-11-12 12:12:32 -06:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Eternalisime
8f4863be28 combat: balance tweaks on roshwalr 2022-11-11 10:22:23 +01:00
Eternalisime
f1b77e27fe combat: lowered flee_health on roshwalr 2022-11-10 16:57:29 +01:00
Eternalisime
918d5eb345 combat: added a unique kit to roshwalr 2022-11-10 13:53:12 +01:00
LunarEclipse
32abb59132 Updated some of my personal info 2022-11-08 23:06:32 +01:00
DaforLynx
b2b14e7ab4 Event music can use more than one event at a time. Added test for soundtracks. 2022-11-07 22:39:25 +00:00
holychowders
571b07d54a Remove dt and multiplication by 30. 2022-11-06 13:10:17 -06:00
Avi Weinstock
372ffe45d7 Add command for debugging ways. 2022-10-29 14:32:48 -04:00
holychowders
641a5c4cda Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2 2022-10-29 13:21:27 -05:00
Avi Weinstock
08a50afd9f Mostly working train tracks. 2022-10-28 21:36:42 -04:00
holychowders
3d4ad29d1d Flee if attacked even if attacker is not close. 2022-10-28 21:31:49 +00:00