Commit Graph

15689 Commits

Author SHA1 Message Date
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
eeaa52f63e Merge branch 'xMAC94x/rustls_pemfile_update' into 'master'
update rustls_pemfile

See merge request veloren/veloren!4479
2024-05-29 08:32:21 +00:00
82939a9971 Merge branch 'sam/projectile-rework' into 'master'
Rewrote projectile constructor

See merge request veloren/veloren!4457
2024-05-29 08:13:49 +00:00
4c35ef95f7 Merge branch 'crab/pickupitem-amount-overflow' into 'master'
Fix overflow in PickupItem::amount

See merge request veloren/veloren!4477
2024-05-29 01:53:59 +00:00
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
8ed78a8bb6 Merge branch 'sam/finisher-consistency' into 'master'
All finisher abilities now consume all combo

See merge request veloren/veloren!4483
2024-05-28 23:58:48 +00:00
Sam
7a7e6391b4 Rewrote projectile constructor 2024-05-28 19:54:36 -04:00
flo
d920facfb2 Merge branch 'dagon_anticheese' into 'master'
dagon_anticheese

See merge request veloren/veloren!4478
2024-05-28 19:13:49 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
7dd2072ced Fix overflow in PickupItem::amount and set persistence stack_size to i64 2024-05-28 19:06:11 +00:00
a2ea012f43 upgrade rustls 2024-05-28 12:56:18 +00:00
Sam
e160435684 Changed all finisher abilities to consume all combo so that it is consistent across sword/axe/hammer 2024-05-27 21:38:13 -04:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
9264c10289 Merge branch 'srpapinha/parried-debuff-rework' into 'master'
Parried debuff rework

See merge request veloren/veloren!4416
2024-05-27 22:01:28 +00:00
f17c5661ea Parried debuff rework 2024-05-27 22:01:28 +00:00
601712cf77 Merge branch 'changelog-fix' into 'master'
Remove changelog misinformation

See merge request veloren/veloren!4480
2024-05-26 12:25:08 +00:00
374c04b6a2 Remove changelog misinformation 2024-05-26 08:01:23 -04:00
88b9643b11 Merge branch 'sylv256/prompt-i18n' into 'master'
Fix #1806: Localize PromptDialog

Closes #1806

See merge request veloren/veloren!4464
2024-05-24 17:18:41 +00:00
c9141f4c6b Fix #1806: Localize PromptDialog 2024-05-24 17:18:41 +00:00
2c138fc0eb update rustls_pemfile 2024-05-24 18:09:26 +02:00
372c43e538 Merge branch 'xMAC94x/install_macos_rustup' into 'master'
install missing toolchain on pipelien on macos runners

See merge request veloren/veloren!4312
2024-05-23 15:50:04 +00:00
636e1bc2b3 only add aarch64 target on the macos-aarch64 job 2024-05-23 08:21:02 +00:00
331c5b8f98 add target 2024-05-23 08:17:04 +00:00
de1a99d8cb uninstall old toolchains 2024-05-23 08:17:04 +00:00
73de7859bc install missing toolchain on pipelien on macos runners 2024-05-23 08:17:04 +00:00
flo
9ea234a17a Merge branch 'neura/cultist-loot' into 'master'
Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese

See merge request veloren/veloren!4460
2024-05-23 06:07:21 +00:00
6c79e5dd9a Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese 2024-05-23 06:07:20 +00:00
cd59c6716f Merge branch 'neura/misc-deps-update' into 'master'
Minor crate updates

See merge request veloren/veloren!4474
2024-05-20 18:26:00 +00:00
3556eb6ed7 Update rcgen 2024-05-20 13:08:55 -04:00
88fe77479b Update minifb 2024-05-20 13:04:22 -04:00
64a79f21f9 Update rstar 2024-05-20 13:04:22 -04:00
fbe7db846e Update treeculler 2024-05-20 13:04:21 -04:00
23afb9237f Update rodio 2024-05-20 13:04:21 -04:00
d6f239832a Update native-dialog 2024-05-20 13:04:21 -04:00
2138b5cc8f Update rusqlite 2024-05-20 13:04:20 -04:00
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
13bccaf888 Update profiling and tracing-tracy crates 2024-05-20 13:04:15 -04:00
16cd184c47 Merge branch 'xMAC94x/reorder_network_crates' into 'master'
in order to update quinn / rusttls, move config to workspace Cargo.toml

See merge request veloren/veloren!4470
2024-05-20 17:01:19 +00:00
d322d9e42c Merge branch 'christof/wasmtime_update' into 'master'
wasmtime update

See merge request veloren/veloren!4475
2024-05-20 15:14:07 +00:00
b2998676cb in order to update quinn / rusttls, move config to workspace Cargo.toml 2024-05-20 16:43:45 +02:00
8502aabe68 wasmtime update 2024-05-20 15:56:38 +02:00
5bced33ff6 Merge branch 'xMAC94x/update_deps' into 'master'
cargo update

See merge request veloren/veloren!4468
2024-05-19 21:54:39 +00:00
b258dc9d6d cargo update 2024-05-19 10:48:58 +02:00
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
3cc4b947eb it seems like the make_case_elim doctest ran endlessly, probably because there is nothign to ran and something got confused in rust doctest, solution is to create a dummy main fn 2024-05-19 02:20:05 +02:00
e48fc4c2b2 additional cargo clippy for toolchain switch 2024-05-18 22:44:59 +02:00
dd43f3b281 update ci tag 2024-05-18 19:38:45 +02:00
df5f767610 cleanup and more correct simd behavior 2024-05-18 19:15:27 +02:00
667d1aa8f0 replace packed_simd with new simd, reenabled simd on world 2024-05-18 10:38:08 +02:00