Joshua Barretto
b6d8182382
Merge branch 'zesterer/item-merging' into 'master'
...
Zesterer/item merging
See merge request veloren/veloren!3912
2023-05-05 00:03:22 +00:00
Joshua Barretto
73c84dfcc2
Clippy
2023-05-05 00:04:13 +01:00
Joshua Barretto
8d9625d6ee
Addressed comments
2023-05-04 23:18:40 +01:00
Joshua Barretto
693684d1c9
Updated changelog
2023-05-04 22:13:14 +01:00
Joshua Barretto
ee971e4056
Added item merging
2023-05-04 22:12:25 +01:00
Marcel
32d8d25124
Merge branch 'xMAC94x/updateSQL' into 'master'
...
Update SQLlite
See merge request veloren/veloren!3862
2023-05-04 20:55:15 +00:00
Marcel Märtens
27620e665b
we need a new version of refinery that needs a new version of rusqlite, so update both
2023-05-04 20:53:00 +02:00
Marcel
ce4beff7fe
Merge branch 'xMAC94x/update_deps' into 'master'
...
update veloren deps
See merge request veloren/veloren!3911
2023-05-04 18:28:59 +00:00
Imbris
60dbcf86f9
Merge branch 'imbris/server-start-faster' into 'master'
...
Improve server startup times, in particular, finding paths between sites.
See merge request veloren/veloren!3888
2023-05-04 18:06:38 +00:00
Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Isse
4e3eb3ef44
Merge branch 'isse/accessability' into 'master'
...
Accessibility settings tab, and subtitles
See merge request veloren/veloren!3901
2023-05-03 16:26:22 +00:00
Isse
44bf8f19f1
combine into one filter_map
2023-05-03 16:29:56 +02:00
Isse
922ba9ed5c
add note about using threshold for subtitle duration
2023-05-03 16:15:28 +02:00
Isse
77b7d1a49e
localize after distance filter
2023-05-03 16:10:14 +02:00
Isse
54a7367cb2
Maintain all subtitles, limit calls to state.update
2023-05-03 13:07:36 +02:00
Isse
f60c44d812
nicer ui
2023-05-03 13:07:36 +02:00
Isse
a89fcd1a38
swedish subtitles
2023-05-03 13:07:36 +02:00
Isse
8bab047c87
add to changelog
2023-05-03 13:07:36 +02:00
Isse
99463a37f8
subtitles
2023-05-03 13:07:35 +02:00
Isse
1c9b502f69
move flashing lights to accessability settings tab
2023-05-03 13:07:35 +02:00
Marcel
65098b8066
Merge branch 'walpo/update_readme' into 'master'
...
Update README.md
See merge request veloren/veloren!3891
2023-05-02 19:48:27 +00:00
walpo
de90639e84
Update README.md
2023-05-02 19:48:27 +00:00
Isse
b37a2bf1c7
Merge branch 'hannibal/ui-change' into 'master'
...
Change Other Players to Players
See merge request veloren/veloren!3909
2023-05-02 18:35:28 +00:00
BigKhan
811061062a
Change Other Players to Players
2023-05-02 13:45:19 -04:00
Imbris
d29a1ec052
Switch back to 100 attempts for each site, optimization of
...
find_site_loc, and fix pre-existing bugs.
* In two spots, there were suspicious conversions between chunk positions
/ world positions that I removed. Everything, here should just be in
chunk positions afaict!
* Optimized by skipping further checks if `in_suitable_loc` is false
(main optimization (10x speedup for desert city site location finding
attempts)) as well as only computing `in_suitable_loc` once (minor
optimization).
2023-05-02 06:12:33 -04:00
Imbris
ddf9e0eaab
Address review on !3888
2023-05-01 21:01:50 -04:00
Joshua Barretto
37f7a0331f
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Made NPC sentiment slightly more forgiving
See merge request veloren/veloren!3907
2023-05-01 12:16:28 +00:00
Joshua Barretto
ba8984e1a7
Made NPC sentiment slightly more forgiving
2023-05-01 12:16:40 +01:00
Justin Shipsey
7643147dc2
Merge branch 'DaforLynx/music-update' into 'master'
...
Small music update
See merge request veloren/veloren!3903
2023-04-29 05:34:28 +00:00
DaforLynx
7bf6df5ec1
Small music update
2023-04-29 05:34:28 +00:00
Marcel
0b9181ef56
Merge branch 'Terraaaagd/update-es_LA' into 'master'
...
Terraaaagd/update Spanish Latino translation
See merge request veloren/veloren!3878
2023-04-27 21:16:11 +00:00
Marcel
142202449e
Merge branch 'xMAC94x/update_deps' into 'master'
...
update deps which no longer work in the future of rust
See merge request veloren/veloren!3902
2023-04-27 20:06:33 +00:00
Marcel
88b26e8db8
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3858
2023-04-27 19:38:28 +00:00
Jonathan Berglin
d5a8829cfd
Update swedish translations
2023-04-27 19:38:28 +00:00
Marcel Märtens
f58feb0c23
update deps which no longer work in the future of rust
2023-04-27 21:11:45 +02:00
Marcel
53746e5a2c
Merge branch 'AMAIOLAMO/update-zh_CN' into 'master'
...
Amaiolamo/update zh_CN translation
See merge request veloren/veloren!3880
2023-04-27 10:24:30 +00:00
Marcel
bd2e211cbd
Merge branch 'walpo/update_es_es_translation' into 'master'
...
Update the Spanish (Castilian) translation
See merge request veloren/veloren!3896
2023-04-25 17:26:27 +00:00
walpo
ba70f72fb7
Update the Spanish (Castilian) translation
2023-04-25 17:26:27 +00:00
Isse
f5f6edca5c
Merge branch 'isse/fix-no-exp-no-drop' into 'master'
...
Fix items not dropping when no exp is given.
See merge request veloren/veloren!3899
2023-04-25 15:58:24 +00:00
Isse
3d3a6eab2b
Fix items not dropping when no exp is given.
2023-04-25 11:33:44 +02:00
Imbris
4becb2c616
Refactor iteration over cardinals for bridges to explicitly check for the cardinal direction instead of using specific indices, performance seems roughly the same.
2023-04-25 01:10:34 -04:00
Imbris
29f0f0d83f
Rename cheapest_score for clarity and add documentation to fields of NodeEntry
2023-04-24 22:43:40 -04:00
Isse
4d79c89a0c
Merge branch 'floppy_multiloot' into 'master'
...
Add multiloot
See merge request veloren/veloren!3839
2023-04-23 19:17:40 +00:00
Isse
ab4076518f
Add multiloot
2023-04-23 19:17:39 +00:00
Imbris
1a287e4e89
Merge branch 'imbris/docs-index' into 'master'
...
Generate index page for documentation using unstable flag
See merge request veloren/veloren!3895
2023-04-23 17:35:28 +00:00
Imbris
fa7b6a1746
Merge branch 'imbris/3883-todo' into 'master'
...
Apply TODO from !3883 and a few other refactors
See merge request veloren/veloren!3893
2023-04-23 00:28:17 +00:00
Joshua Yanovski
2c4cbf1404
Merge branch 'pegasus4903/fix_french_errors' into 'master'
...
Fix french errors
See merge request veloren/veloren!3894
2023-04-22 19:17:05 +00:00
pegasus4903
534454cf05
Fix french errors
2023-04-22 19:17:05 +00:00
Imbris
8da8b56308
Generate index page for documentation using unstable flag
2023-04-22 14:16:34 -04:00
Imbris
362bd129c2
Merge branch 'ubruntu/mount_overhead_tweak' into 'master'
...
Hide display name of mount while mounted (at full hp)
See merge request veloren/veloren!3892
2023-04-22 18:13:14 +00:00
