Justin Shipsey
f552a71d68
Merge branch 'snowram/craft-mats' into 'master'
...
Snowram/craft mats
See merge request veloren/veloren!2269
2021-05-07 17:03:45 +00:00
Snowram
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Marcel
00493cb9e0
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update uk_UA
See merge request veloren/veloren!2267
2021-05-07 14:32:03 +00:00
Illia Denysenko
07ba3e659d
Update uk_UA
2021-05-07 14:32:03 +00:00
Justin Shipsey
395ac5c255
Merge branch 'juliancoffee/animal_trainer_transfer' into 'master'
...
Transer Animal Trainers to lvl5 dungeons
See merge request veloren/veloren!2266
2021-05-07 14:13:10 +00:00
juliancoffee
9ed15105c5
Transer Animal Trainers to lvl5 dungeons
2021-05-07 14:50:03 +03:00
Samuel Keiffer
a2999ce96f
Merge branch 'aweinstock/damage-types' into 'master'
...
Add `DamageKind`, and make piercing damage partially ignore damage resistence.
See merge request veloren/veloren!2262
2021-05-06 22:22:49 +00:00
Avi Weinstock
e4cda4309e
Add DamageKind, and make piercing damage partially ignore damage resistence.
...
- Tweak bow/staff M1 stats.
2021-05-06 17:39:06 -04:00
Samuel Keiffer
1ef748c4f3
Merge branch 'james/agent-tactic-refactor' into 'master'
...
Move weapon tactics to functions and take target body into attack radius consideration
See merge request veloren/veloren!2263
2021-05-06 21:17:10 +00:00
James Melkonian
346eb48a27
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
Samuel Keiffer
2c36524c90
Merge branch 'duelsik/wiring-turing-complete' into 'master'
...
(Wiring) Logic - make wiring turing complete
See merge request veloren/veloren!2261
2021-05-06 19:43:37 +00:00
Daniel Mizerski
3197bcd12a
(Wiring) Logic - make wiring turing complete
2021-05-06 19:53:12 +02:00
Marcel
8ae1d106cf
Merge branch 'xMAC94x/fixcrashes' into 'master'
...
revert Client drop to be correct again and also stop network properly
See merge request veloren/veloren!2250
2021-05-06 12:15:45 +00:00
Marcel
91f76d3b00
Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master'
...
instead of manually trying to sync disconnect metrics we now pass a Reason to...
See merge request veloren/veloren!2259
2021-05-06 11:32:37 +00:00
Marcel Märtens
8196fd8b35
instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect.
...
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
2021-05-06 11:43:10 +02:00
Marcel
efed14ccf9
Merge branch 'duelsik/wiring-on-death' into 'master'
...
(Wiring) OnDeath
See merge request veloren/veloren!2256
2021-05-06 09:00:50 +00:00
Samuel Keiffer
b1142a05bf
Merge branch 'sam/mindflayer-balance' into 'master'
...
Mindflayer Balance Tweaks
See merge request veloren/veloren!2257
2021-05-05 22:12:01 +00:00
Marcel
d1210ade4a
Merge branch 'juliancoffee/fix_dropall' into 'master'
...
Don't drop Debug item with /dropall
Closes #1059
See merge request veloren/veloren!2236
2021-05-05 20:35:57 +00:00
Illia Denysenko
2c14f59a35
Don't drop Debug item with /dropall
2021-05-05 20:35:57 +00:00
Sam
dc7e45c8bd
Rebalancing
2021-05-05 14:43:56 -04:00
Daniel Mizerski
b34704ea3f
(Wiring) OnDeath
2021-05-05 19:08:18 +02:00
Marcel
bd966eaf4b
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
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
