Commit Graph

4707 Commits

Author SHA1 Message Date
Marcel
305598c25c Merge branch 'es_la' into 'master'
update es_la

See merge request veloren/veloren!1205
2020-07-15 18:29:26 +00:00
Marcel
d992e2144c Merge branch 'xMAC94x/netfix' into 'master'
xMAC94x/netfix

See merge request veloren/veloren!1203
2020-07-15 16:12:43 +00:00
Marcel Märtens
6c59caf8e1 make prometheus optional in network and fix a panic in the server
- an extra interface `new_with_regisitry` was created to make sure the interface doesn't depend on the features
2020-07-15 16:45:49 +02:00
Marcel Märtens
58cb98deaa use type to reduce complexity 2020-07-15 16:45:44 +02:00
lausek
05cc6f222b avoid comparing to own entity when mounting; fix coding style 2020-07-15 15:31:42 +02:00
lausek
a3326b5744 fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Yanovski
2e2ab3dc1e Fixing various things about shadows.
* Correcting optimal LISPSM parameter.
* Figure shadows are cast when they're not visible.
* Chunk shadows stay cast until you look away.
* Seamless cubemaps for point lights.
* Etc.
2020-07-15 13:30:49 +02:00
PatatasDelPapa
1cdab4b4e8 update es_la 2020-07-14 23:25:46 -04:00
Monty Marz
20af325165 Merge branch 'pfau_zest/crafting' into 'master'
Crafting

See merge request veloren/veloren!1183
2020-07-14 20:11:39 +00:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Marcel
d5bfae886e 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
446923f7d8 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
6510d38b8b 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
3e5c3de2ac Neater compass 2020-07-13 23:23:44 +01:00
Marcel Märtens
c74e5e4b47 Changes requested in rewiew 2020-07-13 23:41:32 +02:00
Marcel
011cfe4942 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
a9be045cb8 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel Märtens
6db9c6f91b 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
187ec42aa2 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
df45d35c0e 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
9d32e3f884 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
041349be48 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
9ae1d8474f dropping participant on client disconnect clients 2020-07-13 13:03:07 +02:00
Marcel Märtens
8fb445b0e8 better lz4 2020-07-13 13:03:04 +02:00
Marcel Märtens
4cefdcefea zests fix - capitalize first letter 2020-07-13 13:03:01 +02:00
Marcel Märtens
5f902b5eab doing a clean shutdown of the BParticipant once the TCP connection is suddenly interrupted 2020-07-13 13:02:55 +02:00
Marcel
2b13b7d952 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
2414d5ae5e 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
5d60fb2e1d 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
0b66a88ae5 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
730a54dad5
localization test: add per file data to overall status, better alignments 2020-07-13 00:40:43 +03:00
Kai
8e523364ac 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
Joshua Yanovski
6c31e6b562 Fix shadow creation. 2020-07-12 19:50:26 +02:00
Joshua Yanovski
6332cbe006 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-07-12 18:47:00 +02:00
Joshua Yanovski
be438657c3 Tweaks to shadows.
Added shadow map resolution configuration, added seamless cubemaps,
documented all existing rendering options, and fixed a few Clippy
errors.
2020-07-12 18:28:08 +02:00
Yusuf Bera Ertan
95fd89b4f9
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
72ec565678
fix localization test 2020-07-12 05:38:11 +03:00
Marcel
930e0028bc 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
6b771b8dca Add a clientside check to only allow freefly camera for admins 2020-07-11 13:59:47 -07:00
Kai
738fa34534 Add freefly camera mode and cycle camera mode keybind 2020-07-11 11:39:04 -07:00
Marcel
1e367d6371 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
a0b866e97b 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
7f6c892cf0 Added migration to fix characters unable to login due to DashMelee ability change 2020-07-11 15:42:19 +01:00
Ben Wallis
6ca6e2d646 Removed rounding from ping delta and added weighted rolling average ping calculation 2020-07-11 15:39:31 +01:00
Joshua Barretto
3c72022c81 Nicer north colour 2020-07-10 18:21:34 +01:00
Marcel
72dd2850e3 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
d44128ac7a 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
cf69d0c5d8 Added minimap compass 2020-07-10 15:00:20 +01:00
Songtronix
26d47304e0 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
728d349c77 fix: show loading screen for singleplayer 2020-07-10 11:05:09 +02:00