Ben Wallis
|
c785e75e60
|
Follow-up fixes from review of inventory MR
|
2021-01-10 11:27:09 +00:00 |
|
Monty Marz
|
9f7ccbb24d
|
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
|
06e7ac25c1
|
fix loot tables, enemy bar color change
|
2021-01-09 15:26:24 +01:00 |
|
Joshua Barretto
|
3d46d51871
|
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
|
d7cbf479e3
|
Fixed a bug which prevented picking up stackable items with a full inventory
|
2021-01-08 23:34:35 +00:00 |
|
Imbris
|
4507ebda80
|
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
|
c09098ee5f
|
Changed default option to false for smooth_pan_enable.
|
2021-01-08 21:08:57 +00:00 |
|
Ben Wallis
|
fcdeca349f
|
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
|
aef2637288
|
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
|
9deeefbd1e
|
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
|
885c0b3b2c
|
Update lock
|
2021-01-08 16:57:29 +01:00 |
|
ccgauche
|
7ab85a8d63
|
Updated changelog
|
2021-01-08 16:34:26 +01:00 |
|
ccgauche
|
5ff2f5bc5d
|
updated to wasmer 1.0.0
- Everything seems to be working just fine
|
2021-01-08 16:33:19 +01:00 |
|
Joshua Barretto
|
1604616768
|
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
|
06ffe61219
|
Added feature flag
changed field name to size
|
2021-01-08 08:48:30 +00:00 |
|
Imbris
|
88f994b291
|
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
|
58ec4760a5
|
Move to WindowEvent from DeviceEvent for zooming
|
2021-01-08 01:38:33 -05:00 |
|
Marcel
|
d35f31b9b5
|
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
|
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 |
|