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
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
juliancoffee
8be18e5b05
(uk_UA) update mining skills translation
2021-07-23 23:07:15 +03:00
juliancoffee
32ac89903c
(uk_UA) update healing aura skill translation
2021-07-23 22:44:14 +03:00
juliancoffee
18ad64d984
(uk_UA) update bow skills translation
2021-07-23 22:18:49 +03:00
Joshua Barretto
1df81360ab
Properly fixed command parsing
2021-07-23 17:33:31 +01:00
Samuel Keiffer
564214cc87
Merge branch 'knightresspaladin/fix-circle-charge' into 'master'
...
Fixed CircleCharge and buffed Rugged Hide droppers
See merge request veloren/veloren!2613
2021-07-23 14:56:36 +00:00
Avi Weinstock
3aa4a1018a
Further improve handling of underground waypoints:
...
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
2021-07-22 23:03:52 -04:00
Marcel
574fc9df90
Merge branch 'xMAC94x/job_metrics' into 'master'
...
implement slowjob metrics to measuere time in queue and execution time
See merge request veloren/veloren!2654
2021-07-22 19:17:30 +00:00
Joshua Barretto
c26c3e8653
Merge branch 'juliancoffee/fix_zombie_birds' into 'master'
...
Wake birds up
See merge request veloren/veloren!2661
2021-07-22 19:14:26 +00:00
Marcel Märtens
e7cba8341b
remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place
2021-07-22 20:57:16 +02:00
Marcel Märtens
1912617e84
implement slowjob metrics to measuere time in queue and execution time
2021-07-22 19:31:21 +02:00
juliancoffee
b288e0f7ea
Wake birds up
...
* give large rtsim birds their default main tool which allows them to
use AI tactics
* force entities to fly on critical failing velocities to avoid suicide
2021-07-22 18:00:22 +03:00
