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 |
|
Samuel Keiffer
|
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 |
|
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 |
|
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 |
|
Samuel Keiffer
|
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 |
|
Papinha
|
f17c5661ea
|
Parried debuff rework
|
2024-05-27 22:01:28 +00:00 |
|
Marcel
|
601712cf77
|
Merge branch 'changelog-fix' into 'master'
Remove changelog misinformation
See merge request veloren/veloren!4480
|
2024-05-26 12:25:08 +00:00 |
|
Youser Nayme
|
374c04b6a2
|
Remove changelog misinformation
|
2024-05-26 08:01:23 -04:00 |
|
Marcel
|
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 |
|
Sylv
|
c9141f4c6b
|
Fix #1806: Localize PromptDialog
|
2024-05-24 17:18:41 +00:00 |
|
crabman
|
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 |
|
crabman
|
636e1bc2b3
|
only add aarch64 target on the macos-aarch64 job
|
2024-05-23 08:21:02 +00:00 |
|
Marcel Märtens
|
331c5b8f98
|
add target
|
2024-05-23 08:17:04 +00:00 |
|
Marcel Märtens
|
de1a99d8cb
|
uninstall old toolchains
|
2024-05-23 08:17:04 +00:00 |
|
Marcel Märtens
|
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 |
|
Youser Nayme
|
6c79e5dd9a
|
Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese
|
2024-05-23 06:07:20 +00:00 |
|
Marcel
|
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 |
|
Youser Nayme
|
3556eb6ed7
|
Update rcgen
|
2024-05-20 13:08:55 -04:00 |
|
Youser Nayme
|
88fe77479b
|
Update minifb
|
2024-05-20 13:04:22 -04:00 |
|
Youser Nayme
|
64a79f21f9
|
Update rstar
|
2024-05-20 13:04:22 -04: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
|
2138b5cc8f
|
Update rusqlite
|
2024-05-20 13:04:20 -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 |
|
Youser Nayme
|
13bccaf888
|
Update profiling and tracing-tracy crates
|
2024-05-20 13:04:15 -04:00 |
|
Marcel
|
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 |
|
Marcel
|
d322d9e42c
|
Merge branch 'christof/wasmtime_update' into 'master'
wasmtime update
See merge request veloren/veloren!4475
|
2024-05-20 15:14:07 +00:00 |
|
Marcel Märtens
|
b2998676cb
|
in order to update quinn / rusttls, move config to workspace Cargo.toml
|
2024-05-20 16:43:45 +02:00 |
|
Christof Petig
|
8502aabe68
|
wasmtime update
|
2024-05-20 15:56:38 +02:00 |
|
Marcel
|
5bced33ff6
|
Merge branch 'xMAC94x/update_deps' into 'master'
cargo update
See merge request veloren/veloren!4468
|
2024-05-19 21:54:39 +00:00 |
|
Marcel Märtens
|
b258dc9d6d
|
cargo update
|
2024-05-19 10:48:58 +02: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
|
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 |
|
Marcel Märtens
|
e48fc4c2b2
|
additional cargo clippy for toolchain switch
|
2024-05-18 22:44:59 +02:00 |
|
Marcel Märtens
|
dd43f3b281
|
update ci tag
|
2024-05-18 19:38:45 +02:00 |
|
Marcel Märtens
|
df5f767610
|
cleanup and more correct simd behavior
|
2024-05-18 19:15:27 +02:00 |
|
Marcel Märtens
|
667d1aa8f0
|
replace packed_simd with new simd, reenabled simd on world
|
2024-05-18 10:38:08 +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 |
|
Marcel
|
e63b42645f
|
Merge branch 'xMAC/smol-fixes' into 'master'
backporting lints from newer toolchain, activating world in server/agent
See merge request veloren/veloren!4462
|
2024-05-17 08:36:03 +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 |
|
crabman
|
b2d7a9291a
|
Merge branch 'curious-potion-naming' into 'master'
Curious potion naming fix (Issue #1896)
Closes #1896
See merge request veloren/veloren!4195
|
2024-05-15 12:12:16 +00:00 |
|
Samuel Keiffer
|
dcce436483
|
Merge branch 'james/rock-snapper' into 'master'
Better Rocksnapper Abilities and Moveset
See merge request veloren/veloren!4454
|
2024-05-15 02:37:33 +00:00 |
|
James Melkonian
|
dc50f67103
|
Reorder rocksnapper abilities
|
2024-05-14 18:23:38 -07:00 |
|
James Melkonian
|
64eac74258
|
Fix i18n test
|
2024-05-14 18:23:37 -07:00 |
|