Commit Graph

11831 Commits

Author SHA1 Message Date
Marcel Märtens
c2b043e524 add a comment about QUIC like Isse proposed 2022-07-03 20:51:49 +02:00
Marcel Märtens
b5d0ee22e4 deactivate some features again and only keep the internal code for now to reuse it in automatic reconnect code 2022-06-30 22:14:24 +02:00
Marcel Märtens
f3e4f022cb rather than letting the api/Participant handling the cleanup, we had to move over to the bParticipant::shutdownmanager.
Because the old case didn't account for the Scheduler got dropped but Participant keept around.
Shutdown behavior is quite easy now: bParticipant sends a oneshot, when that hits we stop. also when Participant gets droped we still stop as there woul dbe no sense in continue running the report_mgr ...
2022-06-30 22:14:24 +02:00
Marcel Märtens
5b63035506 Add a new/unstable functionality report_channel.
This will ask the bparticipant for a list of all channels and their respective connection arguments.
With that one could prob reach the remote side.
The data is gathered by scheduler (or channel for the listener code).
It requeres some read logs so we shouldn't abuse that function call.

in bparticipant we have a new manager that also properly shuts down as the Participant holds the sender to the respective receiver.
The sender is always dropped. inside the Mutex via disconnect and outside via Drop (we need 2 Options as otherwise we would create a runtime inside async context implicitly o.O )
(also i didn't liked the alternative by just overwriting the sender with a fake one, i want a propper Option that can be taken)

The code might also come handy in the future when we implement a auto-reconnect feature in the bparticipant.
2022-06-30 22:14:24 +02:00
Marcel
5284e9ec94 Merge branch 'james/triggered' into 'master'
Wiring System Documentation and Refactoring

See merge request veloren/veloren!3447
2022-06-29 20:28:10 +00:00
James Melkonian
8439f3ef6d Wiring System Documentation and Refactoring 2022-06-29 20:28:09 +00:00
Marcel
fddc97bc77 Merge branch 'tweaks' into 'master'
tweaks entity stats

See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
Imbris
10bbea89e2 Merge branch 'juliancoffee/add_ability_i18n' into 'master'
Add i18n keys to abilities and smol fix

Closes #1253

See merge request veloren/veloren!3446
2022-06-26 19:50:04 +00:00
juliancoffee
3e73fba165 Better naming for shortened key functions
* Old display_shortened that returned Option is now called try_shortened
* What was called try_shortened is now just display_shortest, because if
  shortened version isn't available, it means that regular version is
  already shortened.
2022-06-26 21:59:36 +03:00
juliancoffee
3d1b2735a2 Clean i18n lifetimes 2022-06-26 00:44:55 +03:00
juliancoffee
27e67e79ec (uk_UA) Add abilities translation 2022-06-25 18:19:36 +03:00
juliancoffee
9d928261cb Try to display shortened version of key in diary
* Make try_shortened method that tries shortened version of key or
  regular version if shortened one isn't available
* Use it in most places where display_shortened + display_string were
  used
* Use it for diary skilbar
2022-06-25 18:17:37 +03:00
juliancoffee
8c837da561 Add i18n keys to abilities
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
  of how i18n worked (returning key if string wasn't found), it was
  impossible to do because it leads to UB in case string is missed.
  To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
Samuel Keiffer
f4d9cca89b Merge branch 'sam/small-fixes' into 'master'
Poise damage now only conditionally converted to health damage

See merge request veloren/veloren!3438
2022-06-25 01:59:00 +00:00
runrobdog
7a40ae2db7 tweak entity stats adlet/tracker.ron 2022-06-23 17:48:28 +02:00
runrobdog
16d5ea1e3c Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats 2022-06-23 06:45:22 +02:00
Marcel
80cad63633 Merge branch 'xMAC94x/tcp_read_buf' into 'master'
switch from `read` to `read_buf` in tcp sink. also always reserve 4 times 1500...

See merge request veloren/veloren!3445
2022-06-21 21:07:02 +00:00
Marcel Märtens
3da053c8b4 switch from read to read_buf in tcp sink. also always reserve 4 times 1500 as soon as we are under 1500 bytes in order to have less allocations when sending many small msg.
Note: maybe upgrading tokio helps against the connection issues, there is some mio related stuff: https://github.com/tokio-rs/tokio/releases/tag/tokio-1.18.0
Note: quick also still has the old read, but its more complicated, thus i only want to change it if its tested
2022-06-21 21:24:09 +02:00
Marcel
4e6e754494 Merge branch 'bd/1455' into 'master'
#1455 | Sprites now only spawn on designated block types

See merge request veloren/veloren!3434
2022-06-20 19:24:52 +00:00
Brandon Dyer
d1c80f0b25 #1455 | Sprites now only spawn on designated block types 2022-06-20 19:24:51 +00:00
runrobdog
8c1d4359a8 tweak stats quadmedquick, blackwidow and throped 2022-06-20 14:12:04 +02:00
Ben Wallis
ce9ea8ba04 Merge branch 'xvar/fix-title-fps-cap' into 'master'
Fixed title screen FPS cap not being applied correctly when background FPS limit is greater than the title screen cap

See merge request veloren/veloren!3442
2022-06-19 20:04:14 +00:00
runrobdog
1dc89fbc58 tweak stats theropodbasic 2022-06-19 19:04:30 +02:00
Ben Wallis
be02e3ced0 Fixed title screen FPS cap not being applied correctly when background FPS is set to unlimited 2022-06-19 14:04:36 +01:00
runrobdog
37137a040f fix pathing mammoth 2022-06-19 11:25:59 +02:00
runrobdog
25eed55ca9 stat tweaks to theropod, arthropods and basilisk 2022-06-19 01:35:18 +02:00
Sam
1f60bdd452 Removed sticky thread requirement from bow limbs. 2022-06-18 15:19:37 -04:00
Isse
479affe127 Merge branch 'fix-command-tab' into 'master'
fix

See merge request veloren/veloren!3439
2022-06-18 14:09:25 +00:00
IsseW
c7a6955565 fix 2022-06-18 15:25:55 +02:00
runrobdog
10023b0759 tweak entity stats 2022-06-18 12:33:19 +02:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
runrobdog
1e289e6335 tweaks entity stats 2022-06-17 21:48:09 +02:00
runrobdog
1e19f5541b tweak entity stats 2022-06-17 21:41:04 +02:00
runrobdog
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
Marcel
33014225be Merge branch 'imbris/remove-uneeded-tick-counter' into 'master'
Remove tick_count since we can already get a count of ticks via `tick_time_hist_count`

See merge request veloren/veloren!3436
2022-06-17 07:20:08 +00:00
Imbris
cd503a210e Remove tick_count since we can already get a count of ticks via
`tick_time_hist_count`.
2022-06-16 22:08:54 -04:00
Imbris
11e71529d5 Merge branch 'imbris/event-metrics' into 'master'
Add metrics for counting server events

See merge request veloren/veloren!3435
2022-06-16 02:08:38 +00:00
Imbris
d5718fd410 Switch to counter of events and add tick counter 2022-06-15 19:25:00 -04:00
Imbris
950723dd0d Add metrics for counting server events 2022-06-15 00:40:58 -04:00
Dominik Broński
2404f111f1 Merge branch 'maveth/client_side_mute' into 'master'
Add a client-side mutelist

See merge request veloren/veloren!3349
2022-06-14 20:35:01 +00:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
Joshua Barretto
0ad359f3c8 Merge branch 'zesterer/server-gameplay-settings' into 'master'
Added server gameplay settings, ability to toggle explosion burns off

See merge request veloren/veloren!3433
2022-06-14 15:07:20 +00:00
Joshua Barretto
b555381677 Added server gameplay settings, ability to toggle explosion burns off 2022-06-14 14:24:08 +01:00
Marcel
e83cd45913 Merge branch 'isse/owned-mine-drop' into 'master'
Owned mine loot

See merge request veloren/veloren!3431
2022-06-12 17:56:59 +00:00
Isse
e03b733ad7 Owned mine loot 2022-06-12 17:56:59 +00:00
Samuel Keiffer
179bf7216e Merge branch 'tormod/remove-size' into 'master'
Remove site size from site suitability function.

See merge request veloren/veloren!3427
2022-06-10 18:12:59 +00:00
Isse
28ac436fb7 Merge branch 'isse/fix-depot-bug' into 'master'
Fix depot bug

See merge request veloren/veloren!3430
2022-06-09 13:58:17 +00:00
IsseW
e05da7f6fa fix depot bug 2022-06-09 09:53:06 +02:00
Marcel
b12dc3b020 Merge branch 'christof/faster_orientation' into 'master'
introduce a fast path for the common case of already horizontal ori and small rotation changes

See merge request veloren/veloren!3375
2022-06-08 22:19:33 +00:00
Marcel
ff17adb6da Merge branch 'xMAC94x/network_overflow' into 'master'
add a check to break the sending loop if the current bytes got greater than the total bytes.

See merge request veloren/veloren!3429
2022-06-08 09:05:40 +00:00