4811 Commits

Author SHA1 Message Date
lausek
88895b1c2d avoid comparing to own entity when mounting; fix coding style 2020-07-15 15:31:42 +02:00
lausek
ab29085b6d fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
PatatasDelPapa
e3aa063cd2 update es_la 2020-07-14 23:25:46 -04:00
Monty Marz
c0d7ff6951 Merge branch 'pfau_zest/crafting' into 'master'
Crafting

See merge request veloren/veloren!1183
2020-07-14 20:11:39 +00:00
Joshua Barretto
1c1229fff9 Crafting 2020-07-14 20:11:39 +00:00
Marcel
91fbe23fb6 Merge branch 'xMAC94x/net-improve' into 'master'
xMac94x/net improve

See merge request veloren/veloren!1162
2020-07-14 14:09:43 +00:00
Joshua Barretto
25266923a9 Merge branch 'zesterer/small-fixes' into 'master'
Zesterer/small fixes

See merge request veloren/veloren!1190
2020-07-14 09:54:17 +00:00
Forest Anderson
e271d32ca1 Merge branch 'nwilder/improve-pt-br-translation' into 'master'
Nwilder/improve pt br translation

See merge request veloren/veloren!1199
2020-07-14 03:21:45 +00:00
Joshua Barretto
48391d4f99 Neater compass 2020-07-13 23:23:44 +01:00
Marcel Märtens
d0f644ddf0 Changes requested in rewiew 2020-07-13 23:41:32 +02:00
Marcel
16ba649df7 Merge branch 'clippy-fixes-useless_conversion' into 'master'
Fixed suppressed clippy warnings for #587 - useless_conversion

See merge request veloren/veloren!1198
2020-07-13 20:54:42 +00:00
Ben Wallis
59c30f4835 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel Märtens
d335b2f186 fix a followup bug, after a protocol fail now Participant is closed, including all streams, so we get the stream errors.
We MUST handle them and we are not allowed to act on a stream after it failed, as i am to lazy to change the structure to ensure the client to be imeadiatly dropped i added a AtomicBool to it.
2020-07-13 13:03:35 +02:00
Marcel Märtens
69570b1580 fix Participant shutdown
- we had the problem that Participants couldn't shutdown them self, only by scheduler, which was controlled by api.
  it's needed e.g. to handle the Schudown Frame
 - my initial solution did a full shutdown, which was a problem if in parallel a 2nd shutdown was requested, no possibility of getting the error
 - new solution will only deactivate Participant and Stream. and then still functions correctly, till the api closes the participant and calls the scheduler which then calls the bparticipant again
 - i experimented with a Mutex<oneshot> or 2 and a `select` but it didn't prove that well
 - also adjusted the Error messages to now either Disconnected when gracefully shutdown or ProtocolFailed when some msg couldn't be delivered
  (note later might not be 100% returned correctly yet)
2020-07-13 13:03:30 +02:00
Marcel Märtens
c9c53fecb3 tcp protocol hardening
- make it harder for the server to crash and also kill invalid sessions properly (instead of waiting for them to close)
 - introduce macros to reduce code duplication
 - added tests to check for valid handshake as well as garbage tcp
2020-07-13 13:03:25 +02:00
Marcel Märtens
f19fb5aef9 proper voxygen connect and code cleanups:
- voxygen abort when the server has a invalid veloren_network handshake, e.g. by outdated version instead of try again
- rename Network `Address` to `ProtocolAddr` as sugested by zest as it's a combination of Protocol and std::io::Addr
- remove the manual byte arrays in `protocols.rs` with something more nice
2020-07-13 13:03:20 +02:00
Marcel Märtens
caddd2d9c7 Switch API to return Participant rather than Arc<Participant>
- API behavior switched!
 - the `Network` no longer holds a copy of participant, thus if the return of `connect` (before `Arc<Participant>, now `Participant`) got dropped, the `Participant::Drop` is triggered!
 - you can close a Participant async via `Particiant::disconnect()`, no more need to know the network at this point
 - the `Network::Drop` will check and drop not yet disconnected Participants.
 - you can compare Participants via PartialEq, if they are true they point to the same endpoint (it checks remote_pid)
   - Note: multiple Participants are only supported in theory, wont work yet

Additionally:
 - fix some `debug!`
 - veloren-client will now drop the participant gracefully on shutdown
 - rename `error` to `debug` when 2 times Bparticipant shutdown is called, as it is to be expected in a async runtime
2020-07-13 13:03:14 +02:00
Marcel Märtens
acc6d1d57d dropping participant on client disconnect clients 2020-07-13 13:03:07 +02:00
Marcel Märtens
551495d9e8 better lz4 2020-07-13 13:03:04 +02:00
Marcel Märtens
2efb2e8de4 zests fix - capitalize first letter 2020-07-13 13:03:01 +02:00
Marcel Märtens
fc30f05388 doing a clean shutdown of the BParticipant once the TCP connection is suddenly interrupted 2020-07-13 13:02:55 +02:00
Marcel
587e57ca99 Merge branch 'yusdacra/fix-i18n-test' into 'master'
Fix localization test and add translation status percentage

See merge request veloren/veloren!1196
2020-07-13 10:02:00 +00:00
Marcel
27af3f1bef Merge branch 'gSpera/no_autowalk_after_die' into 'master'
Stopping auto-walk after death: Fixes #607

Closes #607

See merge request veloren/veloren!1197
2020-07-13 08:39:39 +00:00
Marcel Märtens
de5aaf3fa3 move i18n test to i18n file to reduce compile time && merge gitlab jobs to only have 1 cargo test job 2020-07-13 09:50:55 +02:00
Marcel
e9c4c21a9d Merge branch 'fexii/unique-keybinds' into 'master'
Highlight keys which are bound to multiple GameInputs and add a Reset to Defaults button

Closes #605

See merge request veloren/veloren!1193
2020-07-12 21:47:10 +00:00
Yusuf Bera Ertan
5c3e01c678
localization test: add per file data to overall status, better alignments 2020-07-13 00:40:43 +03:00
Kai
257127e5a5 Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00
Yusuf Bera Ertan
921e753fbc
add more error messages, add percentage calculation for each i18n file and an overall percentage result 2020-07-12 14:54:03 +03:00
Yusuf Bera Ertan
1650375a07
fix localization test 2020-07-12 05:38:11 +03:00
Marcel
6764fcff54 Merge branch 'fexii/freefly-camera' into 'master'
Add freefly camera mode and cycle camera mode keybind

See merge request veloren/veloren!1188
2020-07-11 22:45:02 +00:00
Kai
c533d6ba5c Add a clientside check to only allow freefly camera for admins 2020-07-11 13:59:47 -07:00
Kai
58adfdb900 Add freefly camera mode and cycle camera mode keybind 2020-07-11 11:39:04 -07:00
Marcel
fdc73074aa Merge branch 'xvar/fix-client-ping-display' into 'master'
Removed rounding from ping delta and added weighted rolling average ping calculation

See merge request veloren/veloren!1194
2020-07-11 16:51:37 +00:00
Marcel
07cdf63c06 Merge branch 'xvar/bricked-loadouts-fix' into 'master'
Added migration to fix characters unable to login due to DashMelee ability change

See merge request veloren/veloren!1192
2020-07-11 15:19:53 +00:00
Ben Wallis
63260ad880 Added migration to fix characters unable to login due to DashMelee ability change 2020-07-11 15:42:19 +01:00
Ben Wallis
e97a964230 Removed rounding from ping delta and added weighted rolling average ping calculation 2020-07-11 15:39:31 +01:00
Joshua Barretto
d3c6bb2c0e Nicer north colour 2020-07-10 18:21:34 +01:00
Marcel
6636be93cc Merge branch 'ci-strip' into 'master'
remove the strip of the linux binaries in CI, this will prob make it a few MB...

See merge request veloren/veloren!1191
2020-07-10 15:06:58 +00:00
Marcel Märtens
9e015b6377 remove the strip of the linux binaries in CI, this will prob make it a few MB bigger but help to provide a backtrace in case we panic! in our builds or docker server 2020-07-10 16:03:06 +02:00
Joshua Barretto
f14e91ca0f Added minimap compass 2020-07-10 15:00:20 +01:00
Songtronix
e24f773441 Merge branch 'songtronix/fix-singleplayer-loading' into 'master'
fix: show loading screen for singleplayer

See merge request veloren/veloren!1189
2020-07-10 10:14:38 +00:00
Songtronix
6734a39fd4 fix: show loading screen for singleplayer 2020-07-10 11:05:09 +02:00
Joshua Barretto
33d035973d Improved hill path following 2020-07-10 00:43:11 +01:00
Songtronix
1c841695fc Merge branch 'songtronix/fix-specs-idvs' into 'master'
fix: use correct specs(-idvs) versions

See merge request veloren/veloren!1187
2020-07-09 21:08:23 +00:00
Songtronix
8745e3ca98 fix: use correct specs(-idvs) versions
related to torvus
2020-07-09 19:46:30 +02:00
Joshua Barretto
6dc897c874 Commented unused but potentially useful code 2020-07-09 16:54:10 +01:00
Joshua Barretto
4ede438825 Improved pathfinding tolerance and reliability 2020-07-09 16:54:10 +01:00
Joshua Barretto
df4bb6f989 Fixed missed VD update bug 2020-07-09 16:54:10 +01:00
Treeco
e63d991a5d Reset rather than accumulate velocity when stuck or in unloaded chunks 2020-07-09 15:58:07 +01:00
Joshua Barretto
f44b39420b Merge branch 'sam/creature-stats' into 'master'
Creature Specific Stats

See merge request veloren/veloren!1182
2020-07-09 00:04:25 +00:00