Marcel
c7a41f6552
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
07bfa05fcb
update changelog, clippy fixes
2021-03-16 04:06:15 -04:00
Imbris
621b41e7d5
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
351d2fc9bc
Remove tweaks and plots
2021-03-16 03:50:45 -04:00
Imbris
cc3faf479c
Add tracy plot for showing use_grid
2021-03-16 03:50:45 -04:00
Imbris
fc6434e191
Remove commented out radius list
2021-03-16 03:50:45 -04:00
Imbris
5bc9f584dd
Setup spatial grid for entity versus entity collisions
2021-03-16 03:50:45 -04:00
Joshua Barretto
7599aadeda
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
f520fcb8c2
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
Joshua Barretto
ee3d9443a1
Increased network throttling for reduced network bandwidth
2021-03-16 02:40:56 +00:00
Marcel
7f995bc63d
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
aef24832b3
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Marcel
779e8892cc
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
53a011ac03
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
6bd2adab2b
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
3aba9d48f2
Test
2021-03-15 17:35:53 -04:00
Marcel
9352e36cc3
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
9fe64b445b
Fixed incorrect velocity snapping on collision
2021-03-15 20:28:48 +00:00
Sam
9aef296854
Nerfed aura
2021-03-15 14:23:28 -04:00
Marcel
5731c53494
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
0a1a2b953f
Fixed sliding when wielding
2021-03-15 14:18:56 +00:00
Marcel
028e2f8e87
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
d6909f403e
Copy assets/server to the right place in server-cli's Dockerfile.
2021-03-15 09:46:16 -04:00
Marcel
dcf8ddab01
Merge branch 'aweinstock/airship-mvp-rebased' into 'master'
...
Airships
See merge request veloren/veloren!1888
2021-03-15 12:41:24 +00:00
Marcel
e79e083866
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
ded5927aad
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
cea87d2e9a
Rebalanced explosion strengths
2021-03-15 00:36:07 -04:00
Sam
0bd3e5e668
Mounting fix
2021-03-15 00:26:19 -04:00
Sam
fa498cc6cc
Explosions now take into account hitbox of entity.
2021-03-14 23:45:55 -04:00
Avi Weinstock
7546b31057
Cargo fmt after rebasing.
2021-03-14 23:23:03 -04:00
Avi Weinstock
140b958193
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
21656706f6
Improved climbing, block-hopping on airships
2021-03-14 23:21:45 -04:00
Avi Weinstock
caafa0bb71
Fix interpolation for possession, and make the mount point of airships above their deck.
2021-03-14 23:21:45 -04:00
Joshua Barretto
feb1144f52
Fixed climbing/falling friction when on a wall
2021-03-14 23:21:45 -04:00
Joshua Barretto
de24b3db57
Fixed block-snapping, climbing and airship takeoff
2021-03-14 23:21:44 -04:00
Avi Weinstock
55db12e318
Add hermite interpolation for position (disabled for now with a flag, since it breaks possession).
2021-03-14 23:20:48 -04:00
Joshua Barretto
c39d7aa9df
Made level flight work
2021-03-14 23:20:48 -04:00
Avi Weinstock
0fe0562300
Add lerping of physics to extrapolated position, and enable sending updates for stopped entities.
2021-03-14 23:20:48 -04:00
Avi Weinstock
649a54d188
Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps.
2021-03-14 23:20:48 -04:00
Avi Weinstock
ef1ebbcdce
Add machinery for storing component buffers for interpolation.
2021-03-14 23:20:47 -04:00
Joshua Barretto
ca1e72cfa7
Made entities rotate smoothly with airships, fixed rotation speeds
2021-03-14 23:20:47 -04:00
Joshua Barretto
7b7b70b2e8
Fixed jumping inconsistencies, no block-snapping for ships
2021-03-14 23:20:46 -04:00
Joshua Barretto
0c5ff2ea11
Prevented jumping airships
2021-03-14 23:17:29 -04:00
Joshua Barretto
1637a5e889
Fixed airship manifest offset
2021-03-14 23:17:29 -04:00
Joshua Barretto
709444eede
Initial pass for gravity and air resistance for more stable physics
2021-03-14 23:17:29 -04:00
Joshua Barretto
d434ef35cc
Slightly increase block-hop height for better airship block-hopping
2021-03-14 23:17:29 -04:00
Joshua Barretto
1050b6a87c
Removed unnecessary matrix mul
2021-03-14 23:17:29 -04:00
Joshua Barretto
d1c15cbafe
Fixed arrows
2021-03-14 23:17:29 -04:00
Joshua Barretto
f768c3f853
Properly propagate velocity steps during airship collision to avoid falling through airships
2021-03-14 23:17:28 -04:00
Joshua Barretto
26c9fd63ae
Reduced air resistance for better-behaving airships
2021-03-14 23:17:28 -04:00
