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
4,533 Commits 151 Branches 18 Tags
Commit Graph

4533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
b0fba429c5 Updated to winit 20 2020-07-17 21:24:27 -04:00
Justin Shipsey
c5570915e3 Merge branch 'sam/armor-stats' into 'master' 
Armor Protection Stat

Closes #640

See merge request veloren/veloren!1204
 2020-07-18 00:05:28 +00:00
Samuel Keiffer
7c0f90e6b2 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
1499334002 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
414d42f1d8 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
83f7edeef0 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
9ba8be7a72 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
90faaee5d3 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
90a41b4687 Created banned words file 
By default, it's an empty list
 2020-07-16 14:05:35 +00:00
Marcel
a1f5ac5ea0 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
cef9913e74 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
5643349b6f 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
77e97007b7 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
5d7b3c8331 Ismail.assaidi/fr 2020-07-16 11:34:37 +00:00
Monty Marz
882562d48d 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
2aea3538e3 Fix item images, cleanup debug items folder 2020-07-16 02:46:10 +00:00
Monty Marz
1ab7c8b09e 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
313936c2ba de_DE: minor updates on the German translation 2020-07-15 20:56:16 +00:00
Marcel
bf1205d71c 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
9279e01b98 Merge branch 'es_la' into 'master' 
update es_la

See merge request veloren/veloren!1205
 2020-07-15 18:29:26 +00:00
Marcel
d05cbd3730 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
2f2b5b4d04 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
e5be258759 use type to reduce complexity 2020-07-15 16:45:44 +02:00
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