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
Monty Marz
e9cbac387e
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Marcel
afa11d03e5
Merge branch 'james/fix-npc-chat-spam' into 'master'
...
Correct npc chat spam
See merge request veloren/veloren!1921
2021-03-16 23:22:48 +00:00
James Melkonian
ba196c4345
merchants no longer run away while trading
...
(this time without refactoring)
2021-03-16 23:22:48 +00:00
Marcel
20f39bce52
Merge branch 'fix_ci' into 'master'
...
fix ci
See merge request veloren/veloren!1924
2021-03-16 22:32:17 +00:00
Marcel Märtens
b534282dcc
fix ci
2021-03-16 23:31:40 +01:00
Marcel
3fd9d54baf
Merge branch 'xMAC94x/bots' into 'master'
...
bots: add option to join the world via ingame cmd
See merge request veloren/veloren!1923
2021-03-16 22:25:08 +00:00
Marcel
cf29fba14b
Merge branch 'ubruntu/issue983' into 'master'
...
scan_fmt -> 0.2.6
Closes #983
See merge request veloren/veloren!1911
2021-03-16 22:23:23 +00:00
Marcel
34b194d179
Merge branch 'aweinstock/forcedupdate-interpolation' into 'master'
...
Apply ForcedUpdate messages to the interpolation system, potentially improving...
See merge request veloren/veloren!1917
2021-03-16 22:23:04 +00:00
Marcel
f679103041
Merge branch 'sam/nerfs' into 'master'
...
Nerfs
See merge request veloren/veloren!1922
2021-03-16 22:22:04 +00:00
Marcel
ac904f59f0
Merge branch 'sam/invuln-fixes' into 'master'
...
Safezone fixes
See merge request veloren/veloren!1920
2021-03-16 22:20:42 +00:00
Marcel
bd2f102399
Merge branch 'aweinstock/fix-mounting-20210316' into 'master'
...
Fix mounting by making deferred {pos,vel} writes optional in physics.
See merge request veloren/veloren!1918
2021-03-16 22:20:16 +00:00
Sam
18173caefe
NPCs no longer target players inside safezones (and consider them to be defeated)
...
Warding aura no longer sometimes bypasses safezone invulnerability
2021-03-16 15:17:08 -04:00
Avi Weinstock
4d6fb0584a
Fix mounting by making deferred {pos,vel} writes optional in physics.
2021-03-16 14:04:28 -04:00
Marcel Märtens
d7f400f682
bots: add option to join the world via ingame cmd
2021-03-16 18:45:42 +01:00
Avi Weinstock
62de0816e0
Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports.
2021-03-16 11:55:01 -04:00
Marcel
f4fa1e9cd3
Merge branch 'xMAC94x/slowjob' into 'master'
...
instead of using tokio::Threadpool for CPU bound long running tasks, use rayon, but drip feed and limit the tasks
See merge request veloren/veloren!1912
2021-03-16 15:28:28 +00:00
Marcel
e8c8e80f4c
Merge branch 'zesterer/network-tweaks' into 'master'
...
Prevent component inserts being immediately invalidated
See merge request veloren/veloren!1916
2021-03-16 15:28:10 +00:00
Joshua Barretto
ac20e57647
Prevent component inserts being immediately invalidated
2021-03-16 14:24:23 +00:00
Marcel
f680e2a238
Merge branch 'zesterer/network-tweaks' into 'master'
...
Fixed missed component insert bug
See merge request veloren/veloren!1915
2021-03-16 13:05:35 +00:00
Marcel Märtens
a286eb084a
create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it
2021-03-16 13:31:04 +01:00
Joshua Barretto
2d23a89509
Fixed missed component insert bug
2021-03-16 12:19:42 +00:00
Marcel Märtens
0ec863b236
further experiments via a special Group
2021-03-16 09:59:05 +01:00
Marcel Märtens
8b6b463177
experiment with a slowjob that can return data
2021-03-16 09:58:58 +01:00
Marcel
4e4aa0d1db
Merge branch 'imbris/phys-grid-no-thread-fix' into 'master'
...
Imbris/phys grid no thread fix
See merge request veloren/veloren!1914
2021-03-16 08:54:52 +00:00
Imbris
8d9809ed25
update changelog, clippy fixes
2021-03-16 04:06:15 -04:00
