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

6232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ccgauche
4874635465 Updated changelog 2021-01-08 16:34:26 +01:00
ccgauche
dfd1f592e8 updated to wasmer 1.0.0 
- Everything seems to be working just fine
 2021-01-08 16:33:19 +01:00
Joshua Barretto
f325bddf60 Merge branch 'ccgauche/new-wasmer-backend' into 'master' 
ccgauche/new wasmer backend

See merge request veloren/veloren!1644
 2021-01-08 08:48:31 +00:00
ccgauche
1acb394e93 Added feature flag 
changed field name to size
 2021-01-08 08:48:30 +00:00
Imbris
ea67071f56 Merge branch 'imbris/switch-wheel-event' into 'master' 
Move to WindowEvent from DeviceEvent for zooming

Closes #876

See merge request veloren/veloren!1651
 2021-01-08 07:59:31 +00:00
Imbris
35ef4af4f6 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05:00
Marcel
4c1320f2fd Merge branch 'zesterer/better-flagged-storage' into 'master' 
Used new deref-based component flagging storage to reduce network usage by 75%

See merge request veloren/veloren!1605
 2021-01-07 20:25:12 +00:00
Joshua Barretto
ad48b85d68 fixed Cargo.lock conflict 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
 2021-01-07 20:25:12 +00:00
Joshua Barretto
28a2b4f7f2 Merge branch 'james/dependency-dupes' into 'master' 
Upgrade noise crate eliminating duplicate rand dependency

See merge request veloren/veloren!1679
 2021-01-05 22:35:54 +00:00
jiminycrick
3d430fdfae Upgrade noise eliminating old rand dependency 2021-01-05 10:10:47 -08:00
Joshua Barretto
d3001d6b81 Merge branch 'ubruntu/rtsim-flying-birds' into 'master' 
Flying, traveling birds

See merge request veloren/veloren!1663
 2021-01-05 01:04:01 +00:00
ubruntu
97f89a11f0 Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons 2021-01-05 01:04:01 +00:00
Imbris
673eac1494 Merge branch 'a1phyr/improve_list_localization' into 'master' 
Perf: avoid rescanning the localization directory on each frame

See merge request veloren/veloren!1676
 2021-01-04 00:27:34 +00:00
Benoît du Garreau
ff436cc1c8 Use concat to build i18n specifiers" 2021-01-04 00:06:14 +01:00
Benoît du Garreau
bca54a8a46 Avoid a reallocation 2021-01-04 00:06:14 +01:00
Benoît du Garreau
43bb0b404a Fix i18n::list_localization scanning the filesystem on each call 2021-01-04 00:06:14 +01:00
Marcel
e51ef1f4e2 Merge branch 'xMAC94x/update-toolchain' into 'master' 
switch toolchain to nightly-2021-01-01

See merge request veloren/veloren!1675
 2021-01-03 21:53:12 +00:00
Marcel Märtens
4bfa0b01f9 switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01:00
Imbris
78ebb09b61 Merge branch 'a1phyr/fix_list_localization' into 'master' 
Fix i18n::list_localizations

Closes #910

See merge request veloren/veloren!1673
 2021-01-03 19:36:35 +00:00
Benoît du Garreau
e5c3ce0ae8 Fix i18n::list_localizations 2021-01-03 17:48:23 +01:00
Imbris
3fb9603cde Merge branch 'cache-video-modes' into 'master' 
Caching video modes fixes #729

Closes #729

See merge request veloren/veloren!1670
 2021-01-02 06:43:34 +00:00
Imbris
f940e911a2 Merge branch 'vfoulon80/reorganize-translations' into 'master' 
Convert single translation file to a folder

See merge request veloren/veloren!1666
 2021-01-02 05:51:51 +00:00
Vincent Foulon
81a7a7c043 cargo fmt 2021-01-01 23:37:21 +01:00
nobbele
0c7d52a059 caching video modes fixes #729 2021-01-01 17:51:37 +01:00
Vincent Foulon
fbba029bbf verify every localization file instead of just the manifest 2020-12-31 12:32:23 +01:00
Vincent Foulon
a8e82fe760 fix wrongly named variables + rename i18n_files function + capitalize comments 2020-12-31 12:32:22 +01:00
Vincent Foulon
92cbf6956f Update i18n's README.md to correct grammar and formatting 
Address the following reviews:
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981
 2020-12-31 12:32:22 +01:00
Vincent Foulon
84f3f82b45 cargo fmt 2020-12-31 12:32:22 +01:00
Vincent Foulon
89ca98c780 Update Changelog 2020-12-31 12:32:21 +01:00
Vincent Foulon
ccfe0f170a renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
Vincent Foulon
edbf1b9928 update tests to match the new folder layout 2020-12-31 12:32:20 +01:00
Vincent Foulon
87906dc5fa rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
Vincent Foulon
dbec37e17b rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
92bfa2e0ed clean even more code 2020-12-31 12:32:19 +01:00
Vincent Foulon
13d32015bc clear i18n code + revert back some other part of the code to its original state 2020-12-31 12:32:18 +01:00
Vincent Foulon
dfd11c5be0 Convert Localization from Asset to Compound 2020-12-31 12:32:18 +01:00
Vincent Foulon
cf835fc493 use RonLoader as LocalizationFragment's loader directly 2020-12-31 12:32:17 +01:00
Vincent Foulon
87680ba8f1 (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
1e3d9125aa convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
2bed7b4b6c created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
65f0be1d9c fix init_localization return value being in comment 2020-12-31 12:32:15 +01:00
Vincent Foulon
a42d4559cf (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Joshua Barretto
261c794935 Merge branch 'zesterer-master-patch-57550' into 'master' 
Avoid div0 in shiny water shader

See merge request veloren/veloren!1669
 2020-12-31 00:23:15 +00:00
Ben Wallis
0547dc8f8f Merge branch 'xvar/fix-character-load-error-handling' into 'master' 
Fixed character load errors not being displayed on character select screen

See merge request veloren/veloren!1668
 2020-12-30 22:48:43 +00:00
Joshua Barretto
b18ca4d0e0 Avoid div0 in shiny water shader 2020-12-30 22:18:19 +00:00
Ben Wallis
659ca3e737 * Fixed character load errors not being handled in Voxygen. 
* Improved server error message for character load errors.
* Added server logging for item asset load errors during character load.
* Fixed character select error message dialog not supporting long messages.
 2020-12-30 19:29:22 +00:00
Acrimon
6b8b5ea465 Merge branch 'acrimon/m1-compat' into 'master' 
Update authc which will enable M1 compatability

See merge request veloren/veloren!1667
 2020-12-29 02:31:00 +00:00
Acrimon
e79282ce76
update some error handling code 2020-12-29 01:21:09 +01:00
Ben Wallis
55d1bfedb2 Fixed diesel schema namespace conflicts in persistence 2020-12-28 23:56:23 +00:00
Acrimon
d99750f746
update authc 2020-12-28 16:42:40 +01:00