Commit Graph

6718 Commits

Author SHA1 Message Date
09e38e085c Fix i18n::list_localization scanning the filesystem on each call 2021-01-04 00:06:14 +01:00
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
c37384979c switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01:00
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
8ced0a3810 Fix i18n::list_localizations 2021-01-03 17:48:23 +01:00
db9a6a4cec Update tr_TR to new multi file format. 2021-01-02 12:04:04 +03:00
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
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
d54f5ac5f8 cargo fmt 2021-01-01 23:37:21 +01:00
c1859b46f2 caching video modes fixes #729 2021-01-01 17:51:37 +01:00
f8cb45f2f0 verify every localization file instead of just the manifest 2020-12-31 12:32:23 +01:00
b1f2a4eff5 fix wrongly named variables + rename i18n_files function + capitalize comments 2020-12-31 12:32:22 +01:00
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
017bd86185 cargo fmt 2020-12-31 12:32:22 +01:00
14581d4bb3 Update Changelog 2020-12-31 12:32:21 +01:00
7a4c3fa9a6 renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
5b62398e80 update tests to match the new folder layout 2020-12-31 12:32:20 +01:00
b3758d12e4 rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
4d7b985be1 clean even more code 2020-12-31 12:32:19 +01:00
a0a51110a5 clear i18n code + revert back some other part of the code to its original state 2020-12-31 12:32:18 +01:00
59651eb032 Convert Localization from Asset to Compound 2020-12-31 12:32:18 +01:00
2b6b2fd12e use RonLoader as LocalizationFragment's loader directly 2020-12-31 12:32:17 +01:00
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
70c336c6cb fix init_localization return value being in comment 2020-12-31 12:32:15 +01:00
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
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
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
a404707f87 Avoid div0 in shiny water shader 2020-12-30 22:18:19 +00:00
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
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
ce27cfb30f update some error handling code 2020-12-29 01:21:09 +01:00
c07844ba52 Fixed diesel schema namespace conflicts in persistence 2020-12-28 23:56:23 +00:00
e76474463a update authc 2020-12-28 16:42:40 +01:00
2e13806d1a Merge branch 'master' into 'master'
Update pt_BR.ron 

See merge request veloren/veloren!1664
2020-12-27 00:09:13 +00:00
dc46618b4c Update pt_BR.ron 2020-12-27 00:09:12 +00:00
6c778fa3d0 Merge branch 'glider' into 'master'
Adding new glider variants

See merge request veloren/veloren!1660
2020-12-24 02:54:18 +00:00
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
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
e04fa48186 Merge branch 'entropy9s/irontyouforgettingsomething' into 'master'
Add Iron Ingots

See merge request veloren/veloren!1658
2020-12-23 03:25:50 +00:00
3c1e1c6733 Converts npcs names file to ron 2020-12-23 00:58:25 +01:00
e62c77f452 i am stupid and forgot iron ingots, whoops. 2020-12-22 13:07:23 -08:00
4a8d8c2cf5 Merge branch 'Frinksy/fix-buff-flickering' into 'master'
fixing #881 - Buff UI flickering

Closes #881

See merge request veloren/veloren!1654
2020-12-22 15:40:57 +00:00
53d5a9373e fixing #881
- Multiple buffs make the UI icons flicker
2020-12-22 15:40:57 +00:00
3466d638fe Merge branch 'gliding-energy-cost' into 'master'
Glider mid-air deploy and gliding energy-cost

See merge request veloren/veloren!1626
2020-12-18 21:18:32 +00:00
9af232c6e9 Merge branch 'entropy9s/BasicIngredients' into 'master'
Basic Crafting Ingredients

See merge request veloren/veloren!1609
2020-12-18 20:28:44 +00:00
44ffd74957 Merge branch 'a1phyr/fix_debug_items' into 'master'
Fix debug command

See merge request veloren/veloren!1650
2020-12-18 19:15:09 +00:00
8f9db19a4a Glider mid-air deploy and gliding energy-cost 2020-12-18 19:16:06 +01:00