Illia Denysenko
1d66c94aa5
Don't drop Debug item with /dropall
2021-05-05 20:35:57 +00:00
Sam
a29b3dfcfa
Rebalancing
2021-05-05 14:43:56 -04:00
Daniel Mizerski
4b5934c29a
(Wiring) OnDeath
2021-05-05 19:08:18 +02:00
Marcel
4cfd1854d6
Merge branch 'duelsik/wiring-switch-to-maybes' into 'master'
...
(Wiring) Switch to using maybes
See merge request veloren/veloren!2255
2021-05-05 16:21:19 +00:00
Daniel Mizerski
3405a72bde
(Wiring) Switch to using maybes
2021-05-05 16:59:17 +02:00
Marcel
db123be0b8
Merge branch 'xMAC94x/get_rid_of_useless_threadpool' into 'master'
...
rayon::join creates a global threadpool, which is only used in /world
See merge request veloren/veloren!2251
2021-05-05 13:43:18 +00:00
Marcel Märtens
af7091182e
use a constant for recommended_threads
2021-05-05 14:35:06 +02:00
Marcel Märtens
615ab4c1db
revert Client drop to be correct again and also stop network properly, reduce timeout to 10s
2021-05-04 22:34:19 +02:00
Marcel Märtens
a289391cec
cleanup some unused functions, which were exported but never used
2021-05-04 22:13:04 +02:00
Marcel Märtens
87cf347377
limit tokio threads to 1/4 of num_cpus
...
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
2021-05-04 21:06:11 +02:00
Marcel Märtens
9fefdcbbca
rayon::join creates a global threadpool, which is only used in /world
...
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
2021-05-04 21:06:07 +02:00
Samuel Keiffer
101fb498a5
Merge branch 'sam/minotaur' into 'master'
...
Overhauled Minotaur
See merge request veloren/veloren!2193
2021-05-04 16:26:08 +00:00
Imbris
4a0b6b7b2b
Merge branch 'duelsik/wiring-sticky-trigger' into 'master'
...
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)
See merge request veloren/veloren!2241
2021-05-04 16:15:19 +00:00
Daniel Mizerski
766c58e6e7
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)
2021-05-04 17:33:42 +02:00
Sam
ccb5a80a88
Removed useless clippy allow, added todo.
2021-05-04 11:27:17 -04:00
Marcel
04059357c9
Merge branch 'xMAC94x/errorhandling' into 'master'
...
fix error handling in networking and switch to hashbrown, fixing #1118
Closes #1118
See merge request veloren/veloren!2249
2021-05-04 14:09:42 +00:00
Sam
344e8c8a67
Made buff commands exhaustive
2021-05-04 09:54:28 -04:00
Marcel Märtens
059765bd0c
fix error handling in networking and switch to hashbrown, fixing #1118
2021-05-04 15:29:42 +02:00
Sam
f6b364c644
Buff icons
2021-05-04 08:45:14 -04:00
Sam
0831970615
Addressed comments and more testing feedback.
2021-05-04 08:45:14 -04:00
Sam
1d3e831268
Minor balancing tweaks.
2021-05-04 08:45:13 -04:00
Sam
36640627d9
Changelog
2021-05-04 08:45:12 -04:00
Sam
74a68e24d5
Added sfx. Addressed comments.
2021-05-04 08:45:12 -04:00
Sam
777eb2ee6a
Balancing.
2021-05-04 08:45:11 -04:00
Sam
f491854699
Added kit for testing tier 4 dungeons.
2021-05-04 08:45:11 -04:00
Sam
bb98b021da
Particles for frenzy buff and ground cleave.
2021-05-04 08:45:10 -04:00
Sam
445af44dfa
Gave minotaur AI.
2021-05-04 08:45:09 -04:00
Sam
3aa462ed48
Replaced action_timer with action_state so there are additional fields.
2021-05-04 08:45:09 -04:00
jshipsey
8860e60415
anims
2021-05-04 08:45:08 -04:00
Sam
23bace6a0c
Fix charge being broken.
2021-05-04 08:45:07 -04:00
Sam
2e97fad3d8
Added frenzy ability to minotaur.
...
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
2021-05-04 08:45:07 -04:00
Sam
ac57c7fc31
Cleave functional
2021-05-04 08:45:06 -04:00
Sam
c79c929e9f
Crippling strike now functional. Crippled debuff added.
2021-05-04 08:45:05 -04:00
Sam
3e5d9932e9
Miscellaneous balancing
2021-05-04 08:45:05 -04:00
Sam
1d8e2868f1
Charge attack for minotaur functional.
2021-05-04 08:45:04 -04:00
Marcel
d24317d2e9
Merge branch 'yusdacra/chore/nix' into 'master'
...
chore(deps): update nix flake deps
See merge request veloren/veloren!2238
2021-05-04 09:06:02 +00:00
Yusuf Bera Ertan
5979f2c334
chore(deps): update nix flake deps
2021-05-04 11:57:14 +03:00
Marcel
f53c7bdfaa
Merge branch 'xMAC94x/quic' into 'master'
...
Cleanup network, remove some unwraps, add experimental (disabled) Quic support
See merge request veloren/veloren!2221
2021-05-04 00:16:05 +00:00
Imbris
3ff7d4cf0e
Merge branch 'Nereuxofficial-master-patch-20455' into 'master'
...
Fix Typo in Readme.md
See merge request veloren/veloren!2239
2021-05-03 23:33:51 +00:00
Marcel
85f5b7e5e2
Merge branch 'juliancoffee/improve_death_localization' into 'master'
...
Add possibility to translate buff outcomes
See merge request veloren/veloren!2192
2021-05-03 23:03:00 +00:00
Illia Denysenko
652171b146
Add possibility to translate buff outcomes
2021-05-03 23:02:59 +00:00
Avi Weinstock
63d9458b1a
Add heightmap visualization to world/examples.
2021-05-03 16:05:05 -04:00
Samuel Keiffer
82425b841f
Merge branch 'juliancoffee/cast_buff_cmd' into 'master'
...
Adding command for applying buff on player
See merge request veloren/veloren!2240
2021-05-03 19:53:19 +00:00
juliancoffee
852e49a77c
fmt
2021-05-03 22:17:59 +03:00
juliancoffee
693b3d6c8c
Implement 'all' command
2021-05-03 22:07:12 +03:00
juliancoffee
000f90c8bf
Draft implementation
2021-05-03 22:07:09 +03:00
juliancoffee
15a203cde5
update CHANGELOG
2021-05-03 22:05:04 +03:00
Samuel Keiffer
a0899db36a
Merge branch 'slipped/oritweak' into 'master'
...
ori tweaks, animal adjusts
See merge request veloren/veloren!2234
2021-05-03 18:49:22 +00:00
Marcel
15bf3d9398
Merge branch 'xvar/persistence-fixes' into 'master'
...
Fixed a rare server crash when creating a character
See merge request veloren/veloren!2237
2021-05-03 18:09:59 +00:00
Samuel Keiffer
7b82e9b1f4
Merge branch 'sam/ability-sets' into 'master'
...
Allow Specification of Custom Ability Sets per Weapon
See merge request veloren/veloren!2231
2021-05-03 17:50:11 +00:00
