Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,882 Commits 151 Branches 18 Tags 2.1 GiB
51d1a2ecff
Commit Graph

5882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Keiffer
6cce09be85 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
Imbris
d387709ed0 Merge branch 'imbris/vdfix' into 'master' 
Loosen in_vd calculation on the server so that it accepts all chunks a client would request

See merge request veloren/veloren!1213
 2020-07-17 18:04:40 +00:00
Imbris
9e880009e0 Loosen in_vd calculation on the server so that it accepts all chunks a client with the specified vd would request 2020-07-17 17:32:31 +01:00
Marcel
8c1854f22a Merge branch 'xMAC94x/optional_builds' into 'master' 
put optional builds in check like imbris suggested in order to test macOS and other builds easily

See merge request veloren/veloren!1214
 2020-07-17 15:40:45 +00:00
Marcel Märtens
30bd570b8f put optional builds in check like imbris suggested in order to test macOS and other builds easily 2020-07-17 12:17:34 +02:00
Marcel
a89c88dcb3 Merge branch 'T-Dark-char-alias-slur-check' into 'master' 
Char alias slur check

Closes #580

See merge request veloren/veloren!1200
 2020-07-16 14:05:35 +00:00
T-Dark0
d5e9e19881 Created banned words file 
By default, it's an empty list
 2020-07-16 14:05:35 +00:00
Marcel
b4ef6bcbc0 Merge branch 'yusdacra/nix-dependency-updates' into 'master' 
Update nix dependencies and some tweaks

See merge request veloren/veloren!1195
 2020-07-16 13:40:39 +00:00
Yusuf Bera Ertan
f49b4a9908 nix: regenerate Cargo.nix, update dependencies, some tweaks for better reproducibility, remove rustup from shell.nix (causes issues) and add rustc, cargo instead 2020-07-16 13:40:39 +00:00
Songtronix
9195c06c95 Merge branch 'fix-611' into 'master' 
fix #611; add distance check when mounting pet

Closes #611

See merge request veloren/veloren!1208
 2020-07-16 12:39:10 +00:00
Marcel
b4cf3297a4 Merge branch 'ismail.assaidi/fr' into 'master' 
Ismail.assaidi/fr

See merge request veloren/veloren!1210
 2020-07-16 11:34:38 +00:00
Marcel
d6411f478d Ismail.assaidi/fr 2020-07-16 11:34:37 +00:00
Monty Marz
d43950e2f5 Merge branch 'pfau/smöl_fixes' into 'master' 
Fix item images, cleanup debug items folder

See merge request veloren/veloren!1212
 2020-07-16 02:46:10 +00:00
Monty Marz
4facf1e3f3 Fix item images, cleanup debug items folder 2020-07-16 02:46:10 +00:00
Monty Marz
d9209bed9d Merge branch 'lausek/german-translation' into 'master' 
de_DE: minor updates on the German translation

See merge request veloren/veloren!1209
 2020-07-15 20:56:17 +00:00
lausek
9a54031e15 de_DE: minor updates on the German translation 2020-07-15 20:56:16 +00:00
Marcel
fc30cad5fd Merge branch 'jackrubino/it_IT' into 'master' 
Jackrubino/it it

See merge request veloren/veloren!1211
 2020-07-15 18:29:28 +00:00
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
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
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