Marcel
76a22c6607
Merge branch 'juliancoffee/fix_localization_tests' into 'master'
...
Fix off-by-one error in localization tests
See merge request veloren/veloren!2187
2021-04-23 11:42:00 +00:00
juliancoffee
65fbc5ea98
Fix off-by-one error in localization tests
...
BlameHunk lines start counting from 1, not 0. Comparing with `line + 1`
fix this.
2021-04-23 14:11:44 +03:00
Justin Shipsey
8cfa6dfb2d
Merge branch 'update_pt_BR_20210422' into 'master'
...
update pt_br 20210422
See merge request veloren/veloren!2182
2021-04-23 01:00:41 +00:00
Nícolas Wildner
a04768a33e
update pt_br 20210422
2021-04-23 01:00:41 +00:00
Imbris
e41da7e778
Merge branch 'ygor/fix-arrow-outcome-loop' into 'master'
...
Skip physics pass for arrows stuck on surfaces
Closes #1094
See merge request veloren/veloren!2183
2021-04-22 22:30:36 +00:00
Ygor Souza
72167db397
Skip physics pass for arrows stuck on surfaces
...
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
Marcel
21384690af
Merge branch 'revert-3506f754' into 'master'
...
Decouple Test-Ci with Release-Ci
See merge request veloren/veloren!2041
2021-04-22 20:23:59 +00:00
Marcel
8fb27f3d6d
use different docker tags for master and nightly runs,
...
This allow us to decouple our test-ci from the release-ci and is necessary for multiple release channels in the future.
E.g. we can run a master build without it directly beeing pushed to watchtower and airshipper (config setting requiered on airshipper)
Adjust Tags for server-cli
2021-04-22 21:38:29 +02:00
Marcel
592e34e6ba
Merge branch 'aweinstock/deflate-terrain' into 'master'
...
Compress terrain chunks with deflate. Includes a benchmark showing that this...
See merge request veloren/veloren!2166
2021-04-22 17:12:53 +00:00
Marcel
85c3d6d326
Merge branch 'pfau/lantern_handles' into 'master'
...
Add handles to lanterns, fix cooking pot scale
See merge request veloren/veloren!2181
2021-04-22 17:12:07 +00:00
Monty Marz
ccb913a2c0
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
95abcb3c8f
Merge branch 'zesterer/small-fixes' into 'master'
...
Fixed broken crafting sprite requirement
See merge request veloren/veloren!2180
2021-04-22 11:57:13 +00:00
Joshua Barretto
58d5eb7748
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
Ben Wallis
08352bcde8
Merge branch 'lboklin/wildlife-group-spawn-dist' into 'master'
...
Space wildlife group spawns apart to prevent spawnplosions
See merge request veloren/veloren!2178
2021-04-22 08:50:20 +00:00
Ludvig Böklin
b11906ac3a
Space wildlife group spawns apart to prevent spawnplosions
2021-04-22 08:50:20 +00:00
Snowram
d2d637dcd9
Merge branch 'slipped/zeropointeight' into 'master'
...
small tweaks
See merge request veloren/veloren!2168
2021-04-22 07:05:18 +00:00
jshipsey
414c47a402
comments
2021-04-22 00:04:39 -04:00
jshipsey
4500e2a4ca
formatting
2021-04-22 00:04:39 -04:00
jshipsey
6d31e9ad84
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
d47dc7c49e
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Joshua Barretto
d874d7a699
Merge branch 'zesterer/pit-of-tartarus' into 'master'
...
Made the pit of tartarus less bad
See merge request veloren/veloren!2179
2021-04-21 22:08:06 +00:00
Joshua Barretto
1aed08f885
Made the pit of tartarus less bad
2021-04-21 22:18:44 +01:00
Dominik Broński
7589f40eb7
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
...
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
a53d0809a7
Merge branch 'imbris/quickfix' into 'master'
...
Quick physics perf fix
See merge request veloren/veloren!2177
2021-04-21 18:32:53 +00:00
Imbris
101e6cdce6
Quick physics perf fix
2021-04-21 14:03:23 -04:00
Imbris
94e109afc4
Merge branch 'revert-68539a75' into 'master'
...
Revert "Merge branch 'revert-b10718c5' into 'master'"
See merge request veloren/veloren!2176
2021-04-21 17:47:18 +00:00
Imbris
fcfb1f325a
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
580e99b968
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Ludvig Böklin
7d73fdc2c5
Fix ArrowTurret drag coefficient
2021-04-21 18:26:23 +02:00
Joshua Barretto
1c225ff449
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Joshua Barretto
2bc0699f97
Improvements to lantern holding when sitting
2021-04-21 16:54:03 +01:00
Imbris
9818c7131f
Merge branch 'revert-b10718c5' into 'master'
...
Revert "Merge branch 'imbris/agent-opt' into 'master'"
See merge request veloren/veloren!2172
2021-04-21 15:06:35 +00:00
Imbris
1e3fad1690
Merge branch 'lboklin/simplify-buoyancy' into 'master'
...
Simplify buoyancy for performance reasons
See merge request veloren/veloren!2171
2021-04-21 15:06:31 +00:00
Imbris
9fcba290b6
Merge branch 'lboklin/prevent-full-stop-from-drag' into 'master'
...
Prevent drag forces from causing something to come to a complete stop
See merge request veloren/veloren!2170
2021-04-21 15:06:27 +00:00
Joshua Barretto
9e87da7a18
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Ludvig Böklin
bbcb73c4f6
Simplify buoyancy for performance reasons
2021-04-21 16:19:02 +02:00
Ludvig Böklin
3c82a28d80
Prevent drag forces from causing something to come to a complete stop
2021-04-21 16:13:51 +02:00
Imbris
b90b62fcc1
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Avi Weinstock
03de863328
Remove redundant terrain message per MR 2166 comment.
2021-04-20 23:48:15 -04:00
Avi Weinstock
0ae259f359
Cleanup errors introduced in rebase.
2021-04-20 23:34:17 -04:00
Avi Weinstock
b76ca76d8d
Switch the chunk_compression_benchmarks to using a spiral around the origin instead of the top-left corner to get a more representative sample.
2021-04-20 23:24:24 -04:00
Avi Weinstock
c1c7f748ef
Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream.
2021-04-20 23:24:24 -04:00
Avi Weinstock
67ae3494c4
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 23:23:53 -04:00
Imbris
da1622f262
Merge branch 'imbris/agent-opt' into 'master'
...
Make agent target choosing faster, rename common-sys -> common-systems, parallelize more terrain sending things, and remove extra chunk clones
See merge request veloren/veloren!2024
2021-04-21 01:43:06 +00:00
Imbris
42be75ecc0
Appease clippy, add CHANGELOG entry
2021-04-20 15:29:20 -04:00
Imbris
91f092bdaf
Remove extra chunk cloning and parallelize serialization in the server terrain sys
2021-04-20 15:25:05 -04:00
Imbris
b8ab6e2ea0
Remove some of the spans in the agent system
2021-04-20 15:25:05 -04:00
Imbris
deaff0fd7b
Add more profiling spans to the agent system and add timing notes
2021-04-20 15:25:04 -04:00
Imbris
c52e8c8a64
Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle
2021-04-20 15:25:04 -04:00
Imbris
01196adc8c
Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode
2021-04-20 15:25:04 -04:00
