Marcel
6ea205fcc0
Merge branch 'protheory8/change-gameserver-addr-to-be-an-array-of-tuples' into 'master'
...
Remove gameserver_address setting and add protocols_and_addresses setting
See merge request veloren/veloren!2925
2022-02-06 17:45:00 +00:00
Marcel Märtens
97a58f0e14
clean up socket2 networkwork code to do more on the socket2 before convertig it.
2022-02-05 13:08:46 +01:00
Marcel Märtens
2528afafdd
deactivate tests in CI, as they have often no IPv6 configured and would fail in that case
2022-02-05 13:04:16 +01:00
Marcel Märtens
dcfde616d0
In case of IPv6 and NON Windows make sure to not listen on dualstack,
...
for that we need to create a socket2 socket and set_only_v6 to true.
We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-02-05 13:04:16 +01:00
Marcel Märtens
e9bee485ae
Add a test for the new gameserver IPv6 IPv4 behavior
2022-02-05 13:04:16 +01:00
Marcel Märtens
7ba45fa7e5
adjust tracing and remove unused coding
2022-02-05 13:04:16 +01:00
protheory8
7148737252
Remove quic_files server setting
...
(cherry picked from commit 38339d90ceb87008bbb0ce31ad4e28350213a401)
2022-02-05 13:04:16 +01:00
protheory8
89580eba8c
Remove gameserver_address setting and add protocols_and_addresses setting
...
(cherry picked from commit a5e4575ad349aacb1f41a7e93e3d5ff9eeafc6ae)
2022-02-05 13:04:16 +01:00
Marcel
d785e97ae1
Merge branch 'chara_selection' into 'master'
...
New icons in diary general combat section
See merge request veloren/veloren!3176
2022-02-04 20:37:41 +00:00
Zughy
d26906724c
New icons in diary general combat section
2022-02-04 20:37:41 +00:00
Joshua Barretto
b0667f2664
Merge branch 'james/airships-not-ships' into 'master'
...
Restrict RtSim ships to airships
See merge request veloren/veloren!3179
2022-02-04 12:05:44 +00:00
James Melkonian
f21e0f31fb
Restrict RtSim ships to airships
2022-02-03 21:41:20 -08:00
Dominik Broński
19c764dde6
Merge branch 'christof/econfix' into 'master'
...
Small economy cleanup
See merge request veloren/veloren!3164
2022-02-03 21:48:01 +00:00
Joshua Barretto
ac13d07443
Merge branch 'crafting_stations_in_site2_towns' into 'master'
...
add crafting stations to workshop in site2 towns
See merge request veloren/veloren!3174
2022-02-03 17:16:30 +00:00
floppy
74bf89077f
use const CARDINALS to generate spawn positions for crafting_stations.
2022-02-03 17:40:26 +01:00
Samuel Keiffer
924dd2993c
Merge branch 'juliancoffee/fix_husks' into 'master'
...
Add weapons to Husk loadout
See merge request veloren/veloren!3177
2022-02-03 16:36:09 +00:00
juliancoffee
0682bfbe14
Add weapons to Husk loadout
2022-02-03 18:02:51 +02:00
floppy
595e6ee076
- randomize distribution of crafting_stations to static positions
2022-02-02 22:15:04 +01:00
Marcel
afda04e1eb
Merge branch 'command_access' into 'master'
...
Removal of /home
See merge request veloren/veloren!3171
2022-02-02 08:50:23 +00:00
Youssef Fahmy
fdfd2c99ff
Removal of /home
2022-02-02 08:50:23 +00:00
Justin Shipsey
f6510dfab0
Merge branch 'infrandomness/site2/add_giant_trees' into 'master'
...
Implement giant trees in site2
See merge request veloren/veloren!3136
2022-02-02 02:33:37 +00:00
InfRandomness
54b69e37a5
Implement giant trees in site2
2022-02-02 02:33:37 +00:00
floppy
ddc35d8b7d
- add crafting stations to workshop in site2 towns
...
- TODO: connect Painter rng when implemented
2022-02-01 23:53:18 +01:00
Imbris
18f6077321
Merge branch 'imbris/srgb-dither' into 'master'
...
Dither in nonlinear srgb space and dithering related experimental shader options
See merge request veloren/veloren!3160
2022-02-01 21:24:50 +00:00
Joshua Barretto
0ceef00b40
Merge branch 'james/site2-util' into 'master'
...
More CSG primitives
See merge request veloren/veloren!3154
2022-02-01 09:16:38 +00:00
James Melkonian
2aab277d0b
Add doc comments to PrimitiveRef methods
2022-01-31 18:39:03 -08:00
Joshua Barretto
fb7433a5cf
Merge branch 'determanistic-naming' into 'master'
...
Fix biome naming
See merge request veloren/veloren!3173
2022-02-01 00:51:26 +00:00
IsseW
0f7f0ace93
Use DHashMap
2022-02-01 01:20:00 +01:00
James Melkonian
b445bd494e
Bezier curve prisms
2022-01-31 16:13:45 -08:00
James Melkonian
04bdcf2924
Add cubic bezier curve function
2022-01-31 16:13:45 -08:00
James Melkonian
b41f86ab99
More CSG primitives
2022-01-31 16:13:45 -08:00
IsseW
0ba4a3a409
Use DHashSet
2022-02-01 01:07:36 +01:00
Christof Petig
42faef9ab0
clippy is right,
...
but I don't want to rearrange print_sorted (test). so reduce overall strictness
2022-01-31 22:25:38 +01:00
Christof Petig
080444fc8b
juliancoffee prefers this style
2022-01-31 22:19:21 +01:00
Christof Petig
f4f1b5c77b
more stable sorting
2022-01-31 22:00:23 +01:00
Christof Petig
dc92d0ab12
fix multiple calls of init
2022-01-31 21:31:08 +01:00
Christof Petig
d8edd70837
create a nice csv table for comparison
2022-01-31 21:19:23 +01:00
Christof Petig
47aba3e4cd
clean up double rescaling
2022-01-31 20:52:25 +01:00
Christof Petig
6b9180bba6
separate amount from probability
2022-01-31 19:45:39 +01:00
Christof Petig
12fedef98f
fix some test cases
2022-01-31 19:45:39 +01:00
juliancoffee
45ba21796c
Add test cases
2022-01-31 19:45:39 +01:00
Christof Petig
8230323a76
fix code quality
2022-01-31 19:45:39 +01:00
Christof Petig
66c431ba86
cargo fmt
2022-01-31 19:45:39 +01:00
Christof Petig
a98b9ad049
normalize loot tables before combining them, take current values for a start
2022-01-31 19:45:38 +01:00
Christof Petig
8228437b22
load loot table only once, add utility function and test cases
2022-01-31 19:45:38 +01:00
Justin Shipsey
612f084831
Merge branch 'slipped/bipeds' into 'master'
...
Slipped/bipeds
See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00:00
Imbris
201a7485c2
Merge branch 'imbris/fix-shoot-ori' into 'master'
...
Use ori as fallback for look_dir so that other entities will turn properly
See merge request veloren/veloren!3170
2022-01-31 05:07:01 +00:00
Imbris
2325ac3d78
Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)
2022-01-30 23:30:34 -05:00
Samuel Keiffer
a37d221f6b
Merge branch 'sam/particle-fix' into 'master'
...
Fixed lifesteal particles
See merge request veloren/veloren!3169
2022-01-31 00:24:07 +00:00
Sam
097d6cf07c
Extend green
2022-01-30 18:50:18 -05:00
