4d0aa9c3ad
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
update uk_UA localization
See merge request veloren/veloren!2186
2021-04-23 21:30:46 +00:00
4e7aba5b3f
update uk_UA localization
2021-04-23 21:30:46 +00:00
0f5d289ecb
Merge branch 'xMAC94x/quickfix_for_airshipper' into 'master'
...
xMac94x/quickfix for airshipper
See merge request veloren/veloren!2188
2021-04-23 18:52:21 +00:00
a610db5cfc
have a seperate stage for scheduled builds
2021-04-23 17:48:02 +02:00
1489fccbe3
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
dc8d306890
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
8828691935
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
6188bb9e96
update pt_br 20210422
2021-04-23 01:00:41 +00:00
c2a8153325
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
e59f1e8d28
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
6613374053
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
ea16fa10ab
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
e14f8b9745
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
41dc58a147
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
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
8d664ded1a
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
f987f4d628
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
89e043bbca
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
1708b8b4cc
Space wildlife group spawns apart to prevent spawnplosions
2021-04-22 08:50:20 +00:00
87b14dac7a
Merge branch 'slipped/zeropointeight' into 'master'
...
small tweaks
See merge request veloren/veloren!2168
2021-04-22 07:05:18 +00:00
19ce4ad531
comments
2021-04-22 00:04:39 -04:00
2f523f5aa0
formatting
2021-04-22 00:04:39 -04:00
0962fe72f2
fix for 1h on back
2021-04-22 00:04:39 -04:00
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
f1a991fa09
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
19184a49a7
Made the pit of tartarus less bad
2021-04-21 22:18:44 +01:00
1d25016459
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
0cc2a77d1d
Merge branch 'imbris/quickfix' into 'master'
...
Quick physics perf fix
See merge request veloren/veloren!2177
2021-04-21 18:32:53 +00:00
51c0f8733c
Quick physics perf fix
2021-04-21 14:03:23 -04:00
46b452d6a5
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
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
880236f223
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
37713cb4ad
Fix ArrowTurret drag coefficient
2021-04-21 18:26:23 +02:00
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
2c95165c82
Improvements to lantern holding when sitting
2021-04-21 16:54:03 +01:00
68539a751b
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
699a5493ec
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
ae9d9d60ee
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
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
a1744182b3
Simplify buoyancy for performance reasons
2021-04-21 16:19:02 +02:00
6e364665cb
Prevent drag forces from causing something to come to a complete stop
2021-04-21 16:13:51 +02:00
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
95d32b40bb
Remove redundant terrain message per MR 2166 comment.
2021-04-20 23:48:15 -04:00
308ad4d81e
Cleanup errors introduced in rebase.
2021-04-20 23:34:17 -04:00
4f31f1ca38
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
15e32e5655
Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream.
2021-04-20 23:24:24 -04:00
6d9de520f3
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
b10718c568
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
76ff00757f
Appease clippy, add CHANGELOG entry
2021-04-20 15:29:20 -04:00
e17477979f
Remove extra chunk cloning and parallelize serialization in the server terrain sys
2021-04-20 15:25:05 -04:00
