Marcel Märtens
|
96049904a6
|
add keepalive in server-cli so we know it still ticks, ~ all 30s
|
2021-03-21 19:15:40 +01:00 |
|
Marcel
|
1afe3b7de5
|
Merge branch 'xMAC94x/release_numbers' into 'master'
Change the version number to 0.9
See merge request veloren/veloren!1948
|
2021-03-20 12:48:05 +00:00 |
|
Marcel Märtens
|
2733ba2e27
|
Change the version number to 0.9
|
2021-03-20 13:07:09 +01:00 |
|
Marcel
|
ac4d753fc9
|
Merge branch 'aweinstock/fix-playerentity-20210319' into 'master'
Set PlayerEntity in `Client::clean_state`. This fixes several issues where...
See merge request veloren/veloren!1945
|
2021-03-20 11:06:42 +00:00 |
|
Avi Weinstock
|
0ef42e3854
|
Address MR 1945 review comments.
|
2021-03-19 19:53:17 -04:00 |
|
Avi Weinstock
|
03d0748d40
|
Set PlayerEntity in Client::clean_state. This fixes several issues where interpolation would kick in after changing characters, causing the player to be locked in place or shoot into the sky on respawn or teleport.
|
2021-03-19 19:02:39 -04:00 |
|
Marcel
|
bf5be892d8
|
Merge branch 'sam/parallelize-beam' into 'master'
Parallelized beam
See merge request veloren/veloren!1944
|
2021-03-19 20:18:37 +00:00 |
|
Samuel Keiffer
|
d489ade082
|
Parallelized beam
|
2021-03-19 20:18:36 +00:00 |
|
Marcel
|
94f82960dd
|
Merge branch 'snowram/hair-fix' into 'master'
Fix a missing dwarf hairstyle
See merge request veloren/veloren!1943
|
2021-03-19 14:11:16 +00:00 |
|
Snowram
|
cb3bf0c884
|
Fix a missing dwarf hairstyle
|
2021-03-19 12:45:08 +01:00 |
|
Marcel
|
2dd0fe1c02
|
Merge branch 'imbris/phys' into 'master'
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
See merge request veloren/veloren!1942
|
2021-03-19 11:12:32 +00:00 |
|
Marcel
|
eabddd7263
|
Merge branch 'christof/trading_fix2' into 'master'
fix merchant getting stuck in non-existant trade when declining after accepting
See merge request veloren/veloren!1941
|
2021-03-19 09:29:45 +00:00 |
|
Imbris
|
9fb44e5674
|
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
|
2021-03-18 21:20:22 -04:00 |
|
Marcel
|
987f2d2b34
|
Merge branch 'agentflight-fix-20210318' into 'master'
Fix agent flight by enabling flight mode at the start of each tick of the...
See merge request veloren/veloren!1940
|
2021-03-18 23:48:27 +00:00 |
|
Christof Petig
|
fb40cd93a9
|
fix merchant getting stuck in non-existant trade when declining after accepting
|
2021-03-19 00:43:23 +01:00 |
|
Avi Weinstock
|
a770ef0f4a
|
Fix agent flight by enabling flight mode at the start of each tick of the agent system.
|
2021-03-18 18:54:23 -04:00 |
|
Marcel
|
87883d9b11
|
Merge branch 'sarrakitty/glowy-fixes' into 'master'
tweaking glow and shine
See merge request veloren/veloren!1926
|
2021-03-18 22:34:20 +00:00 |
|
Snowram
|
e5afb2fcf7
|
Various visual fixes
|
2021-03-18 22:53:06 +01:00 |
|
Sarra
|
eaaf65127d
|
cleaning up some tools
|
2021-03-18 22:52:50 +01:00 |
|
Sarra
|
d1e16a2a00
|
tweaking glow and shine
|
2021-03-18 22:52:40 +01:00 |
|
Marcel
|
587d94fceb
|
Merge branch 'imbris/speeeeeeeeeeeeeed' into 'master'
Combine 5 things into 1
See merge request veloren/veloren!1938
|
2021-03-18 15:51:54 +00:00 |
|
Marcel Märtens
|
e6e56f19f9
|
cleanup faster physics calc
|
2021-03-18 15:22:28 +01:00 |
|
Imbris
|
bf383d9562
|
Combine 5 things into 1
|
2021-03-18 14:26:32 +01:00 |
|
Marcel
|
571a6689e3
|
Merge branch 'vfoulon80/loading-animations' into 'master'
Remove unwraps when asset loading fails
See merge request veloren/veloren!1939
|
2021-03-18 12:56:17 +00:00 |
|
Vincent Foulon
|
80635004a4
|
Remove unwraps when asset loading fails
|
2021-03-18 12:56:17 +00:00 |
|
Marcel
|
8afaea9af7
|
Merge branch 'zesterer/worldgen-tweaks' into 'master'
Reduced frequency of bee hives
See merge request veloren/veloren!1936
|
2021-03-18 08:27:32 +00:00 |
|
Imbris
|
99805f9a8d
|
Merge branch 'imbris/voxel-collider-broadphase' into 'master'
Spatial grid for voxel colliders as well as a basic bounding sphere test
See merge request veloren/veloren!1927
|
2021-03-18 07:03:04 +00:00 |
|
Marcel
|
a6cae66a54
|
Merge branch 'sam/fix-dash' into 'master'
Fixed dash
See merge request veloren/veloren!1933
|
2021-03-18 03:09:46 +00:00 |
|
Marcel
|
9c95e971f2
|
Merge branch 'vfoulon80/loading-animations' into 'master'
Add new random loading animations
See merge request veloren/veloren!1931
|
2021-03-18 02:28:34 +00:00 |
|
Joshua Barretto
|
6c939b35b8
|
Merge branch 'zesterer/network-tweaks' into 'master'
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
See merge request veloren/veloren!1935
|
2021-03-18 01:47:29 +00:00 |
|
Joshua Barretto
|
64c8f75a4f
|
Merge branch 'sam/remove-combat-last-pos' into 'master'
Shockwaves and beams no longer use last position in calculating if they hit.
See merge request veloren/veloren!1934
|
2021-03-18 01:07:18 +00:00 |
|
Sam
|
5384e5a01e
|
Fixed dash
|
2021-03-17 20:13:12 -04:00 |
|
Joshua Barretto
|
9a3731e810
|
Merge branch 'DaforLynx/aura-sfx' into 'master'
Adds sfx for Sceptre aura
See merge request veloren/veloren!1932
|
2021-03-17 23:54:50 +00:00 |
|
DaforLynx
|
fbf4defa04
|
Adds sfx for Sceptre aura
|
2021-03-17 23:54:49 +00:00 |
|
Vincent Foulon
|
eafa69ee4c
|
allow loading animations to be contributed from a manifest file
|
2021-03-17 23:41:28 +01:00 |
|
Joshua Barretto
|
fadf5ee1ec
|
Reduced frequency of bee hives
|
2021-03-17 21:43:08 +00:00 |
|
Joshua Barretto
|
e8b053a09f
|
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
|
2021-03-17 21:31:07 +00:00 |
|
Sam
|
2bceb2d3a6
|
Shockwaves and beams no longer use last position in calculating if they hit.
|
2021-03-17 17:24:39 -04:00 |
|
Vincent Foulon
|
62b945dab1
|
Add new random loading animations
|
2021-03-17 18:15:25 +01:00 |
|
Marcel
|
c27593c2d0
|
Merge branch 'xMAC94x/harden-threads' into 'master'
add a check that at least 1 thread works for slowJobPool and for every configuration
See merge request veloren/veloren!1930
|
2021-03-17 14:24:48 +00:00 |
|
Marcel Märtens
|
49e5fe96df
|
add a check that at least 1 thread works for slowJobPool and for every configuration
|
2021-03-17 14:36:58 +01:00 |
|
Marcel
|
6e6878ca9e
|
Merge branch 'tormeh/add-monologue-strings' into 'master'
Add monologue strings.
See merge request veloren/veloren!1925
|
2021-03-17 08:45:27 +00:00 |
|
Marcel
|
b1a718754c
|
Merge branch 'xMAC94x/fix_slowjob' into 'master'
slowjob: allow at least 1 job of every type
See merge request veloren/veloren!1929
|
2021-03-17 08:08:12 +00:00 |
|
Marcel Märtens
|
529eae2e9d
|
slowjob: allow at least 1 job of every type
|
2021-03-17 08:26:43 +01:00 |
|
Imbris
|
198cc7e75a
|
Remove extra instrumentation and the old voxel collider loop
|
2021-03-16 23:42:13 -04:00 |
|
Imbris
|
e70f097738
|
Spatial grid for voxel colliders as well as a basic bounding sphere test
before doing any actual expensive voxel collision checking
|
2021-03-16 23:32:03 -04:00 |
|
Marcel
|
684789c886
|
Merge branch 'vfoulon80/fr-skills' into 'master'
[FR] translate skills.ron + missing keys
See merge request veloren/veloren!1901
|
2021-03-17 01:25:12 +00:00 |
|
Vincent Foulon
|
6b0028907d
|
[FR] translate skills.ron + missing keys
|
2021-03-17 01:25:11 +00:00 |
|
Tormod G. Hellen
|
f695b11171
|
Add monologue strings.
|
2021-03-17 01:58:12 +01:00 |
|
Marcel
|
084fb647b9
|
Merge branch 'pfau/09BG' into 'master'
0.9 background, 10 fire staffs, improved starting gear visuals
See merge request veloren/veloren!1919
|
2021-03-16 23:23:24 +00:00 |
|