Commit Graph

8327 Commits

Author SHA1 Message Date
Daniel Mizerski
a2a0329440 (Wiring) Switch to using maybes 2021-05-05 16:59:17 +02:00
Marcel
3ddbb479f2 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
4cfdbdd069 use a constant for recommended_threads 2021-05-05 14:35:06 +02:00
Marcel Märtens
68d326c817 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
76319cb260 cleanup some unused functions, which were exported but never used 2021-05-04 22:13:04 +02:00
Marcel Märtens
0142cf37f0 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
6e3a74b476 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
fb940ad27a Merge branch 'sam/minotaur' into 'master'
Overhauled Minotaur

See merge request veloren/veloren!2193
2021-05-04 16:26:08 +00:00
Imbris
217502d516 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
f1681f465f (Wiring) Change Sticky to be handled by physics (but with disabled force on it) 2021-05-04 17:33:42 +02:00
Sam
5521c886c0 Removed useless clippy allow, added todo. 2021-05-04 11:27:17 -04:00
Marcel
bc285a470e 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
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Marcel Märtens
df7b65289d fix error handling in networking and switch to hashbrown, fixing #1118 2021-05-04 15:29:42 +02:00
Sam
d99623b298 Buff icons 2021-05-04 08:45:14 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
c4bf1be73b Changelog 2021-05-04 08:45:12 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
7ac1488181 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
Sam
811f1fadb2 Replaced action_timer with action_state so there are additional fields. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
257c670aaf Fix charge being broken. 2021-05-04 08:45:07 -04:00
Sam
d1139c3b7c 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
e052c7b516 Cleave functional 2021-05-04 08:45:06 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
Sam
660423932c Miscellaneous balancing 2021-05-04 08:45:05 -04:00
Sam
f11c10d3be Charge attack for minotaur functional. 2021-05-04 08:45:04 -04:00
Marcel
0c61ccfe89 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
57bfe95939
chore(deps): update nix flake deps 2021-05-04 11:57:14 +03:00
Marcel
3c16966721 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
90e531691d 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
fec33c83dd 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
f04a4f907a Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Avi Weinstock
a8a89cd6d3 Add heightmap visualization to world/examples. 2021-05-03 16:05:05 -04:00
Samuel Keiffer
622d7c5033 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
88ac70c8c7 fmt 2021-05-03 22:17:59 +03:00
juliancoffee
4ba6d438ff Implement 'all' command 2021-05-03 22:07:12 +03:00
juliancoffee
b81981f805 Draft implementation 2021-05-03 22:07:09 +03:00
juliancoffee
db0b05aaff update CHANGELOG 2021-05-03 22:05:04 +03:00
Samuel Keiffer
771a8db2a8 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
f5c7f99846 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
610c529c42 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
Marcel
1643e30545 Merge branch 'aweinstock/imageterrain' into 'master'
Compress terrain with images for clients with low bandwidth.

See merge request veloren/veloren!2207
2021-05-03 14:10:38 +00:00
Avi Weinstock
efa4f9fe0a Experiment with const fn lanczos lookup tables, enable weighted average interpolation for now. 2021-05-03 00:09:44 -04:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
f0824af80a Move chunk_compression_benchmarks from bin to examples. 2021-05-03 00:09:24 -04:00