juliancoffee
|
1bdab02aad
|
Deduplicate bar text
|
2021-07-28 10:33:51 +03:00 |
|
juliancoffee
|
e6c451ca4b
|
Prettify skillbar code
|
2021-07-28 10:33:50 +03:00 |
|
juliancoffee
|
e6f2dc314c
|
Deduplicate skillbar slots
|
2021-07-28 10:33:50 +03:00 |
|
Marcel
|
3497f4fa12
|
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 |
|
Marcel
|
7a3755b7b0
|
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
|
a564602495
|
Tygyh/update missing swedish translations
|
2021-07-27 11:14:52 +00:00 |
|
Marcel
|
e15d3bc111
|
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
|
84b010f16f
|
Fix spelling errors in German translations
|
2021-07-27 11:06:22 +00:00 |
|
Marcel Märtens
|
4328a45066
|
fixed map to zoom and drag correctly, fixed #1111
|
2021-07-27 01:15:06 +02:00 |
|
Imbris
|
d5b134e355
|
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
|
b386e71593
|
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
|
18b5c1c35a
|
Add shortcut to toggle chat
|
2021-07-26 02:42:35 +02:00 |
|
Samuel Keiffer
|
db559176e9
|
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
|
f164d6036e
|
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
|
b4f70dcf19
|
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
|
199d56b1db
|
Fix block-hopping with strangely sized blocks
|
2021-07-25 20:03:17 +01:00 |
|
Imbris
|
1a081cdc5b
|
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
|
b984bf006f
|
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
|
b6f931a1d2
|
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
|
edad38098f
|
Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions"
This reverts commit 0247ae2bf6.
|
2021-07-25 12:29:21 -04:00 |
|
Avi Weinstock
|
516ad1c772
|
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
This reverts commit 63eff216f0.
|
2021-07-25 12:28:25 -04:00 |
|
Joshua Barretto
|
3ba6abfcb4
|
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
|
cd2992afd3
|
Tygyh/resolve clippy error supressions
|
2021-07-25 15:35:14 +00:00 |
|
KK
|
f473265fb0
|
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
|
54eb97b9de
|
Reduce number of map layers and remove unneeded alpha channel
|
2021-07-24 19:54:40 -07:00 |
|
Joshua Barretto
|
37077b5703
|
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
|
c79975dc5d
|
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
|
2021-07-24 22:11:50 +02:00 |
|
Joshua Barretto
|
43ae09d2f0
|
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
|
04700982d3
|
Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions
|
2021-07-24 20:35:13 +02:00 |
|
Dr. Dystopia
|
360bf860ac
|
Resolve unused '#[allow(clippy::manual_unwrap_or)]' error supressions
|
2021-07-24 20:26:15 +02:00 |
|
Dr. Dystopia
|
72058ef32e
|
Resolve unused '#[allow(clippy::eval_order_dependence)]' error supressions
|
2021-07-24 20:24:57 +02:00 |
|
Dr. Dystopia
|
db48e30ea1
|
Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions
|
2021-07-24 20:22:05 +02:00 |
|
Dr. Dystopia
|
f039321cd7
|
Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions
|
2021-07-24 20:19:16 +02:00 |
|
Dr. Dystopia
|
632eba0145
|
Resolve unused '#[allow(clippy::collapsible_if)]' error supressions
|
2021-07-24 20:16:18 +02:00 |
|
Dr. Dystopia
|
70d0840e96
|
Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions
|
2021-07-24 20:14:26 +02:00 |
|
Dr. Dystopia
|
1ac3d1b761
|
Resolve unused '#[allow(clippy::same_item_push)]' error supressions
|
2021-07-24 20:08:08 +02:00 |
|
Dr. Dystopia
|
c577a7d677
|
Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions
|
2021-07-24 20:04:52 +02:00 |
|
Dr. Dystopia
|
575db6f51d
|
Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions
|
2021-07-24 20:01:11 +02:00 |
|
Joshua Barretto
|
6fa3ac610b
|
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
|
5dd56b724c
|
Rename find_space_opt to try_find_space.
|
2021-07-24 13:09:10 -04:00 |
|
juliancoffee
|
7386da743e
|
(uk_UA) address feedback
|
2021-07-24 18:34:57 +03:00 |
|
Joshua Barretto
|
c7f14d300f
|
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
|
fde58b4fbb
|
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
|
6dfa233cc4
|
Fixed bad non-humanoid lantern offset
|
2021-07-24 15:05:36 +01:00 |
|
Joshua Barretto
|
9f46bf9258
|
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
|
4bfc92c65d
|
Changed singleplayer map for a better default experience
|
2021-07-24 11:56:08 +01:00 |
|
juliancoffee
|
2e72f5e1c2
|
(uk_UA) misc hud translation
|
2021-07-24 01:50:14 +03:00 |
|
juliancoffee
|
d1f9e34fc3
|
(uk_UA) force update
|
2021-07-24 01:13:50 +03:00 |
|
juliancoffee
|
0e3e3bef4e
|
(uk_UA) MEAT translation
|
2021-07-24 01:13:02 +03:00 |
|
juliancoffee
|
eb3dd0a812
|
(uk_UA) graphics settings translation
|
2021-07-24 00:26:38 +03:00 |
|