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
Imbris
f2ff5c9655
Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs
2021-03-16 03:50:45 -04:00
Imbris
6146adf5f0
Remove tweaks and plots
2021-03-16 03:50:45 -04:00
Imbris
4b6688ddfe
Add tracy plot for showing use_grid
2021-03-16 03:50:45 -04:00
Imbris
1306ccb6d9
Remove commented out radius list
2021-03-16 03:50:45 -04:00
Imbris
cfa0512cd0
Setup spatial grid for entity versus entity collisions
2021-03-16 03:50:45 -04:00
Joshua Barretto
fb850a4ec8
Merge branch 'zesterer/network-tweaks' into 'master'
...
Zesterer/network tweaks
See merge request veloren/veloren!1913
2021-03-16 04:11:16 +00:00
Joshua Barretto
6f10a56589
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
Joshua Barretto
bf66886e7c
Increased network throttling for reduced network bandwidth
2021-03-16 02:40:56 +00:00
Marcel
1e0f12c8df
Merge branch 'james/alignment' into 'master'
...
Various RtSim and Agent Interaction Fixes
See merge request veloren/veloren!1895
2021-03-16 01:30:36 +00:00
James Melkonian
6ea43cfd75
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Bryant Deters
ff5b8e440d
scan_fmt -> 0.2.6
2021-03-15 17:48:21 -05:00
Marcel
39ac300bef
Merge branch 'sam/buff-fix-test' into 'master'
...
Fif Buff Emission
See merge request veloren/veloren!1910
2021-03-15 22:46:44 +00:00
Marcel
606dea022b
Merge branch 'zesterer/fix-sliding' into 'master'
...
Fixed incorrect velocity snapping on collision
See merge request veloren/veloren!1909
2021-03-15 22:38:43 +00:00
Marcel
ad49318a63
Merge branch 'sam/explosion-fix' into 'master'
...
Explosions now take into account hitbox of entity.
See merge request veloren/veloren!1905
2021-03-15 22:26:28 +00:00
Sam
1b2a62d5a8
Nerfs
2021-03-15 17:36:58 -04:00
Sam
a983f5249f
Test
2021-03-15 17:35:53 -04:00
Marcel
d5aabed419
Merge branch 'sam/ward-nerf' into 'master'
...
Nerfed aura
See merge request veloren/veloren!1908
2021-03-15 20:40:20 +00:00
Joshua Barretto
578d81058a
Fixed incorrect velocity snapping on collision
2021-03-15 20:28:48 +00:00
Sam
0576e30b9e
Nerfed aura
2021-03-15 14:23:28 -04:00
Marcel
74edb9285f
Merge branch 'zesterer/fix-sliding' into 'master'
...
Fixed sliding when wielding
See merge request veloren/veloren!1907
2021-03-15 16:58:14 +00:00
Joshua Barretto
0312c06295
Fixed sliding when wielding
2021-03-15 14:18:56 +00:00
Marcel
c0de8c851b
Merge branch 'fix-dockerfile-20210315' into 'master'
...
Copy `assets/server` to the right place in server-cli's Dockerfile.
See merge request veloren/veloren!1906
2021-03-15 13:52:06 +00:00
Avi Weinstock
2e2b74fde1
Copy assets/server to the right place in server-cli's Dockerfile.
2021-03-15 09:46:16 -04:00
Marcel
28450ca90a
Merge branch 'aweinstock/airship-mvp-rebased' into 'master'
...
Airships
See merge request veloren/veloren!1888
2021-03-15 12:41:24 +00:00
Marcel
5b21ee7200
Merge branch 'aweinstock/airship-mvp-rebased' into 'master'
...
Airships
See merge request veloren/veloren!1888
2021-03-15 11:37:12 +00:00
Forest Anderson
0049976da9
Merge branch 'aweinstock/tradefixes-20210314' into 'master'
...
Client-side trade fixes: update recipe cache and always put client on the same...
See merge request veloren/veloren!1904
2021-03-15 04:52:09 +00:00
Sam
461ad6e339
Rebalanced explosion strengths
2021-03-15 00:36:07 -04:00
Sam
0c7ea992c2
Mounting fix
2021-03-15 00:26:19 -04:00
Sam
26f5d40bff
Explosions now take into account hitbox of entity.
2021-03-14 23:45:55 -04:00
Avi Weinstock
41342deab6
Cargo fmt after rebasing.
2021-03-14 23:23:03 -04:00
Avi Weinstock
9304ecab3d
Address Imbris's MR 1888 comments, and add changelog entry.
...
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Joshua Barretto
1e9ee3d243
Improved climbing, block-hopping on airships
2021-03-14 23:21:45 -04:00
Avi Weinstock
546ee48073
Fix interpolation for possession, and make the mount point of airships above their deck.
2021-03-14 23:21:45 -04:00
