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
Joshua Barretto
2d23a89509
Fixed missed component insert bug
2021-03-16 12:19:42 +00: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
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
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
Joshua Barretto
be9476a1ca
Fixed climbing/falling friction when on a wall
2021-03-14 23:21:45 -04:00
Joshua Barretto
6add95bd5c
Fixed block-snapping, climbing and airship takeoff
2021-03-14 23:21:44 -04:00
Avi Weinstock
23b1417275
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
29b93d791b
Made level flight work
2021-03-14 23:20:48 -04:00
Avi Weinstock
bbb11882e2
Add lerping of physics to extrapolated position, and enable sending updates for stopped entities.
2021-03-14 23:20:48 -04:00
Avi Weinstock
dad0012973
Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps.
2021-03-14 23:20:48 -04:00
Avi Weinstock
a71bacdce0
Add machinery for storing component buffers for interpolation.
2021-03-14 23:20:47 -04:00
Joshua Barretto
f6c6319952
Made entities rotate smoothly with airships, fixed rotation speeds
2021-03-14 23:20:47 -04:00
Joshua Barretto
e232a2e473
Fixed jumping inconsistencies, no block-snapping for ships
2021-03-14 23:20:46 -04:00
Joshua Barretto
8247c136bc
Prevented jumping airships
2021-03-14 23:17:29 -04:00
Joshua Barretto
5bc9f894ab
Fixed airship manifest offset
2021-03-14 23:17:29 -04:00
Joshua Barretto
b8a27f493c
Initial pass for gravity and air resistance for more stable physics
2021-03-14 23:17:29 -04:00
Joshua Barretto
71c07734f7
Slightly increase block-hop height for better airship block-hopping
2021-03-14 23:17:29 -04:00