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
9,429 Commits 151 Branches 18 Tags
Commit Graph

9429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joshua Barretto
13bbb082b8 Fixed bad non-humanoid lantern offset 2021-07-24 15:05:36 +01:00
Joshua Barretto
5edbe7b598 Merge branch 'zesterer/new-sp-map' into 'master' 
Changed singleplayer map for a better default experience

See merge request veloren/veloren!2670
 2021-07-24 11:41:19 +00:00
Joshua Barretto
b2143d52a8 Changed singleplayer map for a better default experience 2021-07-24 11:56:08 +01:00
juliancoffee
cd775b9f16 (uk_UA) misc hud translation 2021-07-24 01:50:14 +03:00
juliancoffee
ae992ec12a (uk_UA) force update 2021-07-24 01:13:50 +03:00
juliancoffee
15341bf140 (uk_UA) MEAT translation 2021-07-24 01:13:02 +03:00
juliancoffee
ca9f42498d (uk_UA) graphics settings translation 2021-07-24 00:26:38 +03:00
juliancoffee
05fb25584e (uk_UA) frozen outcome translation 2021-07-24 00:12:41 +03:00
juliancoffee
996a030c31 (uk_UA) gameinput.greet translation 
Здоровенькі були
 2021-07-24 00:07:26 +03:00
juliancoffee
e685d7686e (uk_UA) update debuff translation 2021-07-24 00:03:34 +03:00