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,236 Commits 151 Branches 18 Tags 2.1 GiB
fcdeca349f
Commit Graph

6236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
fcdeca349f Merge branch 'xvar/item-storage' into 'master' 
Inventory/Loadout rework

See merge request veloren/veloren!1652
 2021-01-08 19:12:09 +00:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Joshua Barretto
9deeefbd1e Merge branch 'ccgauche/wasmer1.0.0' into 'master' 
ccgauche/wasmer1.0.0

See merge request veloren/veloren!1681
 2021-01-08 17:39:43 +00:00
ccgauche
885c0b3b2c Update lock 2021-01-08 16:57:29 +01:00
ccgauche
7ab85a8d63 Updated changelog 2021-01-08 16:34:26 +01:00
ccgauche
5ff2f5bc5d updated to wasmer 1.0.0 
- Everything seems to be working just fine
 2021-01-08 16:33:19 +01:00
Joshua Barretto
1604616768 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
06ffe61219 Added feature flag 
changed field name to size
 2021-01-08 08:48:30 +00:00
Imbris
88f994b291 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
58ec4760a5 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05:00
Marcel
d35f31b9b5 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
a4b9230f03 fixed Cargo.lock conflict 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
 2021-01-07 20:25:12 +00:00
Joshua Barretto
1d55dbd217 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
aceac9e205 Upgrade noise eliminating old rand dependency 2021-01-05 10:10:47 -08:00
Joshua Barretto
9b3c642cae 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
ae366e03c5 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
40a301cbf6 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
67642b0467 Use concat to build i18n specifiers" 2021-01-04 00:06:14 +01:00
Benoît du Garreau
055df2a8df Avoid a reallocation 2021-01-04 00:06:14 +01:00
Benoît du Garreau
09e38e085c Fix i18n::list_localization scanning the filesystem on each call 2021-01-04 00:06:14 +01:00
Marcel
1358a5d40c 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
c37384979c switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01:00
Imbris
da8fdafd6a 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
8ced0a3810 Fix i18n::list_localizations 2021-01-03 17:48:23 +01:00
Imbris
17be17834e 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
b61c1e6436 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
d54f5ac5f8 cargo fmt 2021-01-01 23:37:21 +01:00
nobbele
c1859b46f2 caching video modes fixes #729 2021-01-01 17:51:37 +01:00
Vincent Foulon
f8cb45f2f0 verify every localization file instead of just the manifest 2020-12-31 12:32:23 +01:00
Vincent Foulon
b1f2a4eff5 fix wrongly named variables + rename i18n_files function + capitalize comments 2020-12-31 12:32:22 +01:00
Vincent Foulon
da81b2f0b2 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
017bd86185 cargo fmt 2020-12-31 12:32:22 +01:00
Vincent Foulon
14581d4bb3 Update Changelog 2020-12-31 12:32:21 +01:00
Vincent Foulon
7a4c3fa9a6 renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
Vincent Foulon
5b62398e80 update tests to match the new folder layout 2020-12-31 12:32:20 +01:00
Vincent Foulon
b3758d12e4 rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
Vincent Foulon
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
4d7b985be1 clean even more code 2020-12-31 12:32:19 +01:00
Vincent Foulon
a0a51110a5 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
59651eb032 Convert Localization from Asset to Compound 2020-12-31 12:32:18 +01:00
Vincent Foulon
2b6b2fd12e use RonLoader as LocalizationFragment's loader directly 2020-12-31 12:32:17 +01:00
Vincent Foulon
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
70c336c6cb fix init_localization return value being in comment 2020-12-31 12:32:15 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Joshua Barretto
6cdac39075 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
d94dbc376e 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
a404707f87 Avoid div0 in shiny water shader 2020-12-30 22:18:19 +00:00
Ben Wallis
5636083e27 * 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