2656 Commits

Author SHA1 Message Date
Ben Wallis
3ab3473230 Follow-up fixes from review of inventory MR 2021-01-10 11:27:09 +00:00
Monty Marz
ce91f28dec fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
Scott Williams
8f5c3e3d0c Changed default option to false for smooth_pan_enable. 2021-01-08 21:08:57 +00:00
Ben Wallis
8661cb1ffc 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
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
35ef4af4f6 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05: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
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 Märtens
4bfa0b01f9 switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01: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
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
84f3f82b45 cargo fmt 2020-12-31 12:32:22 +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
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
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
e79282ce76
update some error handling code 2020-12-29 01:21:09 +01:00
Sarra Kitty
81f656ba81 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
Frinksy
fd554827a0 fixing #881
- Multiple buffs make the UI icons flicker
2020-12-22 15:40:57 +00:00
Adam Blanchet
e3b9de37fb 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
Benoît du Garreau
f983f9e915 Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
7d1eb4604b 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
05519ee293 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
2c94b05e99 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
780be6787d Fix clippy lints 2020-12-17 12:06:28 +01:00
Benoît du Garreau
3052ba5f65 cargo fmt 2020-12-17 12:06:22 +01:00
Benoît du Garreau
8bc4b887a8 Move the asset module to a single file 2020-12-17 12:06:13 +01:00
Benoît du Garreau
db18cc1770 Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
jiminycrick
26239394be Switched to hashbrown everywhere 2020-12-17 10:31:35 +01:00
Marcel Märtens
100e858d79 fix wrong alignment 2020-12-16 15:17:17 +01:00
Marcel Märtens
04b71f9dc8 update specs 2020-12-16 14:31:16 +01:00
Marcel Märtens
1f2f9905a3 update guillotiere 2020-12-16 10:56:00 +01:00
Marcel Märtens
075933d60b get rid of some insecure dependencies 2020-12-16 10:42:36 +01:00
Marcel
91ad5657a5 Merge branch 'xMAC94x/dependencies' into 'master'
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)

See merge request veloren/veloren!1641
2020-12-16 09:33:34 +00:00