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

6306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
unknown
3c1e1c6733 Converts npcs names file to ron 2020-12-23 00:58:25 +01:00
Entropy
e62c77f452 i am stupid and forgot iron ingots, whoops. 2020-12-22 13:07:23 -08:00
Joshua Barretto
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
Frinksy
53d5a9373e fixing #881 
- Multiple buffs make the UI icons flicker
 2020-12-22 15:40:57 +00:00
Justin Shipsey
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
Justin Shipsey
9af232c6e9 Merge branch 'entropy9s/BasicIngredients' into 'master' 
Basic Crafting Ingredients

See merge request veloren/veloren!1609
 2020-12-18 20:28:44 +00:00
Ben Wallis
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
Ludvig Böklin
8f9db19a4a Glider mid-air deploy and gliding energy-cost 2020-12-18 19:16:06 +01:00
Benoît du Garreau
1ace001fde Fix debug items 2020-12-18 18:11:48 +01:00
Imbris
ace47766f9 Merge branch 'Frinksy/scancodes' into 'master' 
Working towards #861 - Use scancodes for (at minimum) key remapping

See merge request veloren/veloren!1642
 2020-12-18 10:33:57 +00:00
Adam Blanchet
5f9984df12 working towards #861 - 
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
 2020-12-18 10:01:30 +01:00
Entropy
6f331e0435 changed sec count to be consistent w/ other foods 2020-12-17 12:43:33 -08:00
Entropy
5a63366666 Merge branch 'entropy9s/BasicIngredients' of https://gitlab.com/veloren/veloren into entropy9s/BasicIngredients 2020-12-17 12:41:03 -08:00
Ben Wallis
55c49f88e6 Merge branch 'a1phyr/fix_windows_build' into 'master' 
Fix bad specifier breaking on Windows

See merge request veloren/veloren!1648
 2020-12-17 18:33:18 +00:00
Benoît du Garreau
8aac030ecd Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
d2da8d671f Merge branch 'a1phyr/use_assets_manager' into 'master' 
Use `assets_manager` to load assets

See merge request veloren/veloren!1624
 2020-12-17 12:25:29 +00:00
Marcel
37d6fbc3ce Merge branch 'entropicdrifter/refactor-attacker-name' into 'master' 
Create and use get_attacker_name method

See merge request veloren/veloren!1529
 2020-12-17 11:53:36 +00:00
Marcel
78e9f3de28 Merge branch 'test_util' into 'master' 
Add simple tests to utils description functions

See merge request veloren/veloren!1526
 2020-12-17 11:20:19 +00:00
Benoît du Garreau
989683d2d3 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
1c4e334cd4 Apply suggestion 
- Remove default value for CharacterAbility
- Put back accidentally removed comment
 2020-12-17 12:06:32 +01:00