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
Joshua Barretto
50b3039cbc
Fixed incorrectly reversed orientation matrix
2021-03-14 23:17:28 -04:00
Joshua Barretto
a663818324
Fixed incorrect wall climb direction on airships
2021-03-14 23:17:28 -04:00
Joshua Barretto
b24c89050a
Fewer precision issues by using player-relative coordinate space
2021-03-14 23:17:28 -04:00
Avi Weinstock
ee7f760e78
Address MR 1888 review comments.
...
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
2021-03-14 23:17:28 -04:00
Avi Weinstock
036e0c1f02
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Joshua Barretto
65141673c0
Relative velocity collisions
2021-03-14 23:14:26 -04:00
Joshua Barretto
1395462c27
More relative motion changes
2021-03-14 23:14:26 -04:00
Avi Weinstock
956b913a95
/airship angle command and RtSim airships.
2021-03-14 23:14:26 -04:00
Joshua Barretto
6dbf033c61
Mountable airships
2021-03-14 23:14:25 -04:00
Joshua Barretto
db7d5a7771
Fixed water collision bug
2021-03-14 23:14:25 -04:00
Joshua Barretto
3fe3e5f183
Made airship terrain hitboxes smaller
2021-03-14 23:14:25 -04:00
Joshua Barretto
1a850ae65f
Smooth airship movement
2021-03-14 23:14:21 -04:00
Joshua Barretto
59594feb1d
Made animations and friction ground-relative
2021-03-14 23:09:52 -04:00
Joshua Barretto
707549626b
Fixed airship collisions under rotation, added position increment for velocity when on ground
2021-03-14 23:09:52 -04:00
Avi Weinstock
c191b66371
Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.
2021-03-14 23:09:52 -04:00
James Melkonian
acf8b1b5cd
Allow spawned airships to move
2021-03-14 23:09:52 -04:00
Avi Weinstock
c5c9855ab8
Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.
2021-03-14 23:09:51 -04:00
Avi Weinstock
711509d0c1
Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).
2021-03-14 23:09:51 -04:00
Avi Weinstock
ff3f3d1271
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Avi Weinstock
8d3fd5f586
Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory.
2021-03-14 21:41:47 -04:00
Marcel
5ac731254d
Merge branch 'sam/yeet-inputs' into 'master'
...
Reworked Controller Inputs to use Control Actions
See merge request veloren/veloren!1900
2021-03-15 01:32:02 +00:00
