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

4555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
3f36dfd644 Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes 2020-07-17 21:26:21 -04:00
Imbris
9319ea75a0 Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend 2020-07-17 21:26:21 -04:00
Imbris
001e00c455 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
1db52fdce3 Fixes for Alt key related issues 2020-07-17 21:26:21 -04:00
Imbris
ce8194c7a6 small fix and refactor stop auto walk to a method 2020-07-17 21:26:21 -04:00
Imbris
7e317e4212 Get misc conrod fixes onto winit-20 branch, add diagnostic printlns 2020-07-17 21:26:21 -04:00
Imbris
2ad0d9268d Fix rebase mistake 2020-07-17 21:26:21 -04:00
Imbris
68917587dc Increment glutin version in Cargo.toml file 2020-07-17 21:26:20 -04:00
Imbris
77b1c5621e Windows cpal conflict fix not released yet so we need to use the git version 2020-07-17 21:26:20 -04:00
Imbris
1d632c6e62 Fix mistake with event processing 2020-07-17 21:26:20 -04:00
Imbris
83c397f7be clippy fixes 2020-07-17 21:26:20 -04:00
Imbris
3f6d9a4f44 Proper fix for winit / cpal conflict 2020-07-17 21:26:20 -04:00
Imbris
231ba6bc00 Winit 0.22 released 2020-07-17 21:26:16 -04:00
Imbris
527c761c47 poll twice 2020-07-17 21:24:29 -04:00
Imbris
c7f4d87c59 Fix singleplayer feature and rebase related stuff 2020-07-17 21:24:28 -04:00
Imbris
f03a5b4f5a Clean comments, fix mistake, change dep source now that compatible version is available on crates.io 2020-07-17 21:24:28 -04:00
Imbris
e1d3307312 fix Window::logical_size 2020-07-17 21:24:28 -04:00
Imbris
bd81a0c729 Update changelog 2020-07-17 21:24:28 -04:00
Imbris
b583a0afce fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
75a109edf3 Update to winit 0.21.0 2020-07-17 21:24:28 -04:00
Imbris
71bb15189c Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
Imbris
2af8f857e4 Switch to updated gfx_window_glutin 2020-07-17 21:24:28 -04:00
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