Adam Strauss
0e6f9a5599
Implement #1105 : Rolling removes burning debuff
2021-05-07 15:38:41 -07:00
Snowram
3ab4ace814
Merge branch 'snowram/craftmats-ron-fix' into 'master'
...
Fixes object manifest
See merge request veloren/veloren!2273
2021-05-07 21:06:37 +00:00
Samuel Keiffer
f9216df5bd
Merge branch 'update_pt_BR_20210507' into 'master'
...
Update pt br 20210507
See merge request veloren/veloren!2272
2021-05-07 20:07:16 +00:00
Nícolas Wildner
1954070b52
Update pt br 20210507
2021-05-07 20:07:14 +00:00
Samuel Keiffer
b39489bc3f
Merge branch 'aweinstock/tradeuifixes-20210506' into 'master'
...
Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity...
See merge request veloren/veloren!2265
2021-05-07 20:07:12 +00:00
Snowram
cfae6a52b3
Fixes object manifest
2021-05-07 22:04:57 +02:00
Avi Weinstock
8dc20d0dd5
Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity trade, and improve the distance merchants are visible at.
2021-05-07 15:24:55 -04:00
Justin Shipsey
a629936686
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
9d4d6a066a
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Marcel
9cfee155e4
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
06ba69653e
Update uk_UA
2021-05-07 14:32:03 +00:00
Justin Shipsey
0eb50bf316
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
8dc032db4b
Transer Animal Trainers to lvl5 dungeons
2021-05-07 14:50:03 +03:00
Samuel Keiffer
67eff3d351
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
ff83cf752b
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
16ff698e91
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
d849bf7d29
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
Samuel Keiffer
82e09290e7
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
e740b4a2a9
(Wiring) Logic - make wiring turing complete
2021-05-06 19:53:12 +02:00
Marcel
864468a891
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
8e4fb87500
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
ab33b8cc3d
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
fd43e7bccd
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
1313dd68dc
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
9473889b3f
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
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
