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,245 Commits 151 Branches 18 Tags 2.1 GiB
568c6e8806
Commit Graph

6245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ccgauche
568c6e8806 Fixed tests on WIndows due to target arch wasm32 2021-01-10 21:49:10 +01:00
Ben Wallis
844a5a3e3c Merge branch 'xvar/inventory-followup' into 'master' 
Inventory followup fixes

Closes #920

See merge request veloren/veloren!1685
 2021-01-10 13:10:09 +00:00
Ben Wallis
3ab3473230 Follow-up fixes from review of inventory MR 2021-01-10 11:27:09 +00:00
Monty Marz
80bd35884b Merge branch 'pfau/hotfix-drops' into 'master' 
Fix loot tables, enemy bar color change

See merge request veloren/veloren!1684
 2021-01-09 16:06:11 +00:00
Monty Marz
ce91f28dec fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
Joshua Barretto
915e03ccd4 Merge branch 'xvar/fix-stackable-item-pickup' into 'master' 
Fixed a bug which prevented picking up stackable items with a full inventory

Closes #921

See merge request veloren/veloren!1683
 2021-01-09 01:23:14 +00:00
Ben Wallis
a6f88d9b22 Fixed a bug which prevented picking up stackable items with a full inventory 2021-01-08 23:34:35 +00:00
Imbris
d850f55fe6 Merge branch 'swilliams/camera_smooth_default' into 'master' 
Changed default option to false for smooth_pan_enable.

See merge request veloren/veloren!1657
 2021-01-08 21:08:57 +00:00
Scott Williams
8f5c3e3d0c Changed default option to false for smooth_pan_enable. 2021-01-08 21:08:57 +00:00
Ben Wallis
295dfb6090 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
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
68606d5740 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
228cc6a4fc Update lock 2021-01-08 16:57:29 +01:00
ccgauche
4874635465 Updated changelog 2021-01-08 16:34:26 +01:00
ccgauche
dfd1f592e8 updated to wasmer 1.0.0 
- Everything seems to be working just fine
 2021-01-08 16:33:19 +01: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
ea67071f56 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
35ef4af4f6 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05:00
Marcel
4c1320f2fd 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
ad48b85d68 fixed Cargo.lock conflict 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
 2021-01-07 20:25:12 +00:00
Joshua Barretto
28a2b4f7f2 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
3d430fdfae Upgrade noise eliminating old rand dependency 2021-01-05 10:10:47 -08:00
Joshua Barretto
d3001d6b81 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
97f89a11f0 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
673eac1494 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
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
e51ef1f4e2 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
4bfa0b01f9 switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01:00
Imbris
78ebb09b61 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
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
Imbris
f940e911a2 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
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
92cbf6956f 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
84f3f82b45 cargo fmt 2020-12-31 12:32:22 +01:00
Vincent Foulon
89ca98c780 Update Changelog 2020-12-31 12:32:21 +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
87906dc5fa rename a translation file to prevent it from being ignored by git 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