Ben Wallis
|
2d878f2a6c
|
Merge branch 'sql_tweaks' into 'master'
Combine multiple inventory loading queries into single reccursive query
See merge request veloren/veloren!2680
|
2021-07-28 21:11:57 +00:00 |
|
Tavo Annus
|
709ca85db4
|
Combine multiple inventory loading queries into single reccursive query
|
2021-07-28 21:11:57 +00:00 |
|
Imbris
|
3896be8902
|
Merge branch 'mohs/918_remove_restrict_mut' into 'master'
Mohs/918 remove restrict mut
See merge request veloren/veloren!2690
|
2021-07-28 20:06:42 +00:00 |
|
Thomas Kosel
|
4e174c0b17
|
#918 reverting wrongly merged inventory related changes.
|
2021-07-28 21:13:09 +02:00 |
|
Marcel
|
1116363aec
|
Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master'
Added fr translation for gameinput.greet
See merge request veloren/veloren!2685
|
2021-07-28 15:52:16 +00:00 |
|
Forest Anderson
|
c5f4f4eb0c
|
Merge branch 'aweinstock/site2-prim-bounds' into 'master'
Avoid duplicate work across chunks when blitting site2 primitives.
See merge request veloren/veloren!2687
|
2021-07-28 14:42:40 +00:00 |
|
Avi Weinstock
|
eac1d9c760
|
Avoid duplicate work across chunks when blitting site2 primitives.
|
2021-07-27 19:12:51 -04:00 |
|
Marcel
|
cd7d154128
|
Merge branch 'xMAC94x/map_fix' into 'master'
fixed map to zoom and drag correctly, fixed #1111
Closes #1111
See merge request veloren/veloren!2659
|
2021-07-27 22:16:22 +00:00 |
|
Thomas Kosel
|
554edde64d
|
#918 remove usages of .restrict_mut() from character_behavior.rs
|
2021-07-27 23:34:16 +02:00 |
|
Thomas Kosel
|
2ae3f9fc1e
|
#918 remove usages of .restrict_mut() from mount.rs and stats.rs
|
2021-07-27 22:22:39 +02:00 |
|
Marcel
|
13b1063406
|
Merge branch 'tygyh/Update-missing-swedish-translations' into 'master'
Tygyh/update missing swedish translations
See merge request veloren/veloren!2667
|
2021-07-27 11:14:52 +00:00 |
|
Jonathan Berglin
|
6607c84a90
|
Tygyh/update missing swedish translations
|
2021-07-27 11:14:52 +00:00 |
|
Marcel
|
d14ccd568f
|
Merge branch 'Fxsch/Fix-spelling-errors-in-german-translations' into 'master'
Fix spelling errors in German translations
See merge request veloren/veloren!2684
|
2021-07-27 11:06:22 +00:00 |
|
Nico Janzen
|
113fb181a3
|
Fix spelling errors in German translations
|
2021-07-27 11:06:22 +00:00 |
|
Alexis Maheu
|
3bd7b4594c
|
Added fr translation for gameinput.greet
|
2021-07-26 20:29:30 -04:00 |
|
Marcel Märtens
|
b1818fb4ca
|
fixed map to zoom and drag correctly, fixed #1111
|
2021-07-27 01:15:06 +02:00 |
|
Imbris
|
16be0abf6c
|
Merge branch 'chat-scrolling-hack' into 'master'
Trying to fix chat hiding behind the chat window.
See merge request veloren/veloren!2678
|
2021-07-26 04:41:15 +00:00 |
|
Imbris
|
444094f871
|
Merge branch 'DanTheOne/toggle_chat_shortcut' into 'master'
Add shortcut to toggle chat
See merge request veloren/veloren!2683
|
2021-07-26 03:42:38 +00:00 |
|
DanTheOne
|
47e49f0409
|
Add shortcut to toggle chat
|
2021-07-26 02:42:35 +02:00 |
|
Samuel Keiffer
|
6cf5c34541
|
Merge branch 'sam/fix-weapon-desync' into 'master'
Made swapping equipped weapons a server event instead of being called in...
See merge request veloren/veloren!2682
|
2021-07-26 00:11:37 +00:00 |
|
Sam
|
449b4bb3d5
|
Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs.
|
2021-07-25 18:30:17 -05:00 |
|
Joshua Barretto
|
c49e29ecde
|
Merge branch 'zesterer/fix-block-hopping' into 'master'
Fix block-hopping with strangely sized blocks
See merge request veloren/veloren!2681
|
2021-07-25 19:49:17 +00:00 |
|
Joshua Barretto
|
a9d9a28c5f
|
Fix block-hopping with strangely sized blocks
|
2021-07-25 20:03:17 +01:00 |
|
Imbris
|
316845d7c3
|
Merge branch 'james/map-ui' into 'master'
Reduce number of map layers and remove unneeded alpha channel
See merge request veloren/veloren!2676
|
2021-07-25 17:24:50 +00:00 |
|
Imbris
|
45d032085f
|
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--match_single_binding)]'-error-supressions' into 'master'
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
See merge request veloren/veloren!2674
|
2021-07-25 17:24:22 +00:00 |
|
Ben Wallis
|
50d1fb83f5
|
Merge branch 'aweinstock/revert-incorrect-clippy-changes' into 'master'
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
See merge request veloren/veloren!2679
|
2021-07-25 17:08:07 +00:00 |
|
Avi Weinstock
|
a274d61677
|
Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions"
This reverts commit 0247ae2bf60dbc3713cba5dc9845f6a06e165c91.
|
2021-07-25 12:29:21 -04:00 |
|
Avi Weinstock
|
b0f76da08d
|
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
This reverts commit 63eff216f050e83404629dfd84ae3c8e38e8fe54.
|
2021-07-25 12:28:25 -04:00 |
|
Joshua Barretto
|
1c141f0c4c
|
Merge branch 'tygyh/Resolve-clippy-error-supressions' into 'master'
Tygyh/resolve clippy error supressions
See merge request veloren/veloren!2675
|
2021-07-25 15:35:14 +00:00 |
|
Jonathan Berglin
|
ffeab0c391
|
Tygyh/resolve clippy error supressions
|
2021-07-25 15:35:14 +00:00 |
|
KK
|
cc8f3f329d
|
This little hack, tries to fix the bad Behavior hiding the chat behind the chat window.
|
2021-07-24 22:43:32 -07:00 |
|
James Melkonian
|
1ec5d7b5d0
|
Reduce number of map layers and remove unneeded alpha channel
|
2021-07-24 19:54:40 -07:00 |
|
Joshua Barretto
|
6162076246
|
Merge branch 'Resolve-unused-clippy-supressions' into 'master'
Resolve unused clippy supressions
See merge request veloren/veloren!2673
|
2021-07-24 20:44:06 +00:00 |
|
Dr. Dystopia
|
4e88e8f209
|
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
|
2021-07-24 22:11:50 +02:00 |
|
Joshua Barretto
|
b517119468
|
Merge branch 'juliancoffee/update-uk_UA' into 'master'
update (uk_UA) translation
See merge request veloren/veloren!2669
|
2021-07-24 19:56:21 +00:00 |
|
Dr. Dystopia
|
54085ea825
|
Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions
|
2021-07-24 20:35:13 +02:00 |
|
Dr. Dystopia
|
6269c82bb2
|
Resolve unused '#[allow(clippy::manual_unwrap_or)]' error supressions
|
2021-07-24 20:26:15 +02:00 |
|
Dr. Dystopia
|
fed78f7def
|
Resolve unused '#[allow(clippy::eval_order_dependence)]' error supressions
|
2021-07-24 20:24:57 +02:00 |
|
Dr. Dystopia
|
2044cea131
|
Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions
|
2021-07-24 20:22:05 +02:00 |
|
Dr. Dystopia
|
0a9c1d6fee
|
Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions
|
2021-07-24 20:19:16 +02:00 |
|
Dr. Dystopia
|
51f350525f
|
Resolve unused '#[allow(clippy::collapsible_if)]' error supressions
|
2021-07-24 20:16:18 +02:00 |
|
Dr. Dystopia
|
d5e2fcca0f
|
Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions
|
2021-07-24 20:14:26 +02:00 |
|
Dr. Dystopia
|
9156470ed3
|
Resolve unused '#[allow(clippy::same_item_push)]' error supressions
|
2021-07-24 20:08:08 +02:00 |
|
Dr. Dystopia
|
dd13f5298d
|
Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions
|
2021-07-24 20:04:52 +02:00 |
|
Dr. Dystopia
|
0a926009e5
|
Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions
|
2021-07-24 20:01:11 +02:00 |
|
Joshua Barretto
|
b82dfc1cee
|
Merge branch 'aweinstock/fix-waypoint-2' into 'master'
Further improve handling of underground waypoints:
See merge request veloren/veloren!2665
|
2021-07-24 17:59:58 +00:00 |
|
Avi Weinstock
|
3b977881fe
|
Rename find_space_opt to try_find_space.
|
2021-07-24 13:09:10 -04:00 |
|
juliancoffee
|
71a0295104
|
(uk_UA) address feedback
|
2021-07-24 18:34:57 +03:00 |
|
Joshua Barretto
|
4634696868
|
Merge branch 'zesterer/cmd' into 'master'
Properly fixed command parsing
See merge request veloren/veloren!2666
|
2021-07-24 15:15:58 +00:00 |
|
Joshua Barretto
|
885eac2928
|
Merge branch 'zesterer/fix-campfire-light' into 'master'
Fixed bad non-humanoid lantern offset
See merge request veloren/veloren!2672
|
2021-07-24 14:41:18 +00:00 |
|