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
Tadabito
db9a6a4cec
Update tr_TR to new multi file format.
2021-01-02 12:04:04 +03: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
Acrimon
d2a7aa34b1
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
ce27cfb30f
update some error handling code
2020-12-29 01:21:09 +01:00
Ben Wallis
c07844ba52
Fixed diesel schema namespace conflicts in persistence
2020-12-28 23:56:23 +00:00
Acrimon
e76474463a
update authc
2020-12-28 16:42:40 +01:00
Ben Wallis
2e13806d1a
Merge branch 'master' into 'master'
...
Update pt_BR.ron
See merge request veloren/veloren!1664
2020-12-27 00:09:13 +00:00
Nícolas Wildner
dc46618b4c
Update pt_BR.ron
2020-12-27 00:09:12 +00:00
Monty Marz
6c778fa3d0
Merge branch 'glider' into 'master'
...
Adding new glider variants
See merge request veloren/veloren!1660
2020-12-24 02:54:18 +00:00
Sarra Kitty
e8eb2b3a6c
new gliders
...
added sandraptor glider
added sandraptor glider
stuff
working on other raptor gliders
adding file and placeholder model (copy of morpho) for monarch butterfly gliders
adding models for snow and wood raptor gliders
added a proper model for the monarch glider
adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table
made raptors drop their feathers
fmt
2020-12-24 02:54:18 +00:00
Justin Shipsey
be4d8a7138
Merge branch 'snowram/npcs-names-json-to-ron' into 'master'
...
Converts npcs names file to ron
See merge request veloren/veloren!1659
2020-12-23 07:43:57 +00:00
Monty Marz
e04fa48186
Merge branch 'entropy9s/irontyouforgettingsomething' into 'master'
...
Add Iron Ingots
See merge request veloren/veloren!1658
2020-12-23 03:25:50 +00:00
