Commit Graph

5625 Commits

Author SHA1 Message Date
Samuel Keiffer
c065b689ac Merge branch 'sam/buff-split-stats' into 'master'
Damage and poise reduction stats now track split modifiers

See merge request veloren/veloren!4484
2024-05-29 15:52:55 +00:00
Samuel Keiffer
79d97cdc22 Merge branch 'sam/diminishing-cc' into 'master'
Diminishing returns for certain crowd control debuffs

See merge request veloren/veloren!4482
2024-05-29 15:50:09 +00:00
Samuel Keiffer
eeb68797e7 Merge branch 'new_sahagin' into 'master'
new_sahagin

See merge request veloren/veloren!4467
2024-05-29 00:01:46 +00:00
flo
ee608d3c25 new_sahagin 2024-05-29 00:01:46 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
Sam
8b24ca68a8 Damage and poise reduction stats now track split modifiers 2024-05-27 22:06:12 -04:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
Sylv
c9141f4c6b Fix #1806: Localize PromptDialog 2024-05-24 17:18:41 +00:00
Youser Nayme
fbe7db846e
Update treeculler 2024-05-20 13:04:21 -04:00
Youser Nayme
23afb9237f
Update rodio 2024-05-20 13:04:21 -04:00
Youser Nayme
d6f239832a
Update native-dialog 2024-05-20 13:04:21 -04:00
Youser Nayme
1fd72a93e1
Unpinned cmake version as the original issue has been fixed.
Also ran `cargo update` to actually update the crate.
2024-05-20 13:04:20 -04:00
Marcel
f5fc2294a6 Merge branch 'xMAC/update-toolchain' into 'master'
update toolchain to `2024-05-14`

See merge request veloren/veloren!4466
2024-05-19 00:40:55 +00:00
Marcel Märtens
e48fc4c2b2 additional cargo clippy for toolchain switch 2024-05-18 22:44:59 +02:00
Marcel Märtens
5f41aefacb update toolchain to 2024-05-14 2024-05-18 00:58:54 +02:00
Marcel
246d90cf22 Merge branch 'fotkurz/plugin-bookkeepingoptimization' into 'master'
Fix #1968: refactor missing_plugins check for better performance

Closes #1968

See merge request veloren/veloren!4463
2024-05-17 22:15:40 +00:00
fotkurz
13a3c53307 Fix #1968: refactor missing_plugins check for better performance 2024-05-16 13:22:11 -03:00
Marcel Märtens
b770665fb9 new toolchain lints helped us to find issues, backporting the bugfixes here.
NOTE: we havent had world enabled in server/agent, this MR now enables this, might have some (hopefully positive) effects on our agent code
2024-05-16 10:40:15 +02:00
James Melkonian
25ad114072 Rocksnapper AI and animation tweaks 2024-05-14 18:22:20 -07:00
James Melkonian
7a23314e3b bowser spin animation 2024-05-14 18:22:20 -07:00
flo
76628057b5 new_cultist 2024-05-12 18:33:11 +00:00
Isse
6c0da4beeb
allow searching in both selected language and fallback langauage in crafting 2024-04-29 13:33:11 +02:00
Sam
38df083e0c Changelog entry, better placeholder UI, remove test changes 2024-04-28 20:04:07 -04:00
Sam
0dc261c70a Judgement 2024-04-28 19:43:50 -04:00
Sam
244ffcf03e Earthshaker 2024-04-28 19:43:49 -04:00
Sam
171125e73e Seismic shock 2024-04-28 19:43:49 -04:00
Sam
caac8025c6 Thunderclap 2024-04-28 19:43:49 -04:00
Sam
85e9af4e08 Tenacity 2024-04-28 19:43:49 -04:00
Sam
7daa9a29eb Rampart 2024-04-28 19:43:49 -04:00
Sam
e1ce09e0a1 Upheaval 2024-04-28 19:40:12 -04:00
Sam
b25e91e79a Iron tempest 2024-04-28 19:40:12 -04:00
Sam
b8de5e414b Helm Crusher 2024-04-28 19:40:12 -04:00
Sam
38c74bf182 Finish rooted debuff impl and Lung Pummel 2024-04-28 19:40:12 -04:00
Sam
76dc196996 Pile Driver 2024-04-28 19:40:12 -04:00
Sam
90f3b671c3 Breach 2024-04-28 19:40:12 -04:00
Sam
7ed66f29bf Spine Cracker 2024-04-28 19:40:12 -04:00
Sam
c9c14c9202 Retaliate 2024-04-28 19:40:12 -04:00
Sam
e858b84427 Intercept 2024-04-28 19:40:11 -04:00
Sam
e24ebc381b Heavy whorl 2024-04-28 19:40:11 -04:00
Sam
909363d33c Vigorous bash 2024-04-28 19:40:11 -04:00
Sam
89048e9530 Tremor 2024-04-28 19:36:17 -04:00
Sam
cc70685f7a Scornful swipe 2024-04-28 19:36:17 -04:00
Sam
af755197bb Wide wallop 2024-04-28 19:36:16 -04:00
Sam
bddced1ab7 Solid smash 2024-04-28 19:36:16 -04:00
Sam
fcfff367c9 Cleanup stuff from old hammer 2024-04-28 19:36:14 -04:00
Sam
78acdcf767 Placeholder UI for skill tree 2024-04-28 19:35:12 -04:00
Sam
09b25d4f74 Initial setup 2024-04-28 19:35:12 -04:00
flo
961f49e2af mine-implementation 2024-04-28 19:31:18 +00:00
miocore
8710aaa07b remove keybind_mode, instead use left click(m1) for set and right click(m2) for unset 2024-04-20 00:57:30 +03:00
crabman
a970b307f8
address review comments 2024-04-16 12:19:12 +00:00