Commit Graph

7160 Commits

Author SHA1 Message Date
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
Joshua Barretto
1af86ef2f8 Removed unnecessary matrix mul 2021-03-14 23:17:29 -04:00
Joshua Barretto
9424998e6e Fixed arrows 2021-03-14 23:17:29 -04:00
Joshua Barretto
44f9932450 Properly propagate velocity steps during airship collision to avoid falling through airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
6d8ba31e5b Reduced air resistance for better-behaving airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
a4e5ba0639 Fixed incorrectly reversed orientation matrix 2021-03-14 23:17:28 -04:00
Joshua Barretto
7feb4942e3 Fixed incorrect wall climb direction on airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
b2ab1046c8 Fewer precision issues by using player-relative coordinate space 2021-03-14 23:17:28 -04:00
Avi Weinstock
a32be4ac5a 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
aa56166c80 Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics. 2021-03-14 23:17:26 -04:00
Joshua Barretto
40c284fd71 Relative velocity collisions 2021-03-14 23:14:26 -04:00
Joshua Barretto
3496c356e2 More relative motion changes 2021-03-14 23:14:26 -04:00
Avi Weinstock
5ff72a4a2e /airship angle command and RtSim airships. 2021-03-14 23:14:26 -04:00
Joshua Barretto
e59b68c262 Mountable airships 2021-03-14 23:14:25 -04:00
Joshua Barretto
09142d99b8 Fixed water collision bug 2021-03-14 23:14:25 -04:00
Joshua Barretto
f44ca1898c Made airship terrain hitboxes smaller 2021-03-14 23:14:25 -04:00
Joshua Barretto
f4b3d8145b Smooth airship movement 2021-03-14 23:14:21 -04:00
Joshua Barretto
afd99788b2 Made animations and friction ground-relative 2021-03-14 23:09:52 -04:00
Joshua Barretto
e1e6403c63 Fixed airship collisions under rotation, added position increment for velocity when on ground 2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04 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
6ff054099f Allow spawned airships to move 2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395 Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf 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
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Avi Weinstock
95992ead4d 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
5570b57282 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
Forest Anderson
8cec35a9af Merge branch 'synis/fix-safezone-mass' into 'master'
Fix safezone entity mass

See merge request veloren/veloren!1902
2021-03-15 00:52:03 +00:00
Imbris
a558d42da7 Merge branch 'snowram/new-npcs' into 'master'
Snowram/new npcs

See merge request veloren/veloren!1896
2021-03-15 00:10:46 +00:00
Imbris
4e454d3215 Merge branch 'imbris/ping-while-waiting-for-gamesync' into 'master'
Keep connection alive while waiting for initial sync

See merge request veloren/veloren!1898
2021-03-14 22:07:56 +00:00
Sam
ecff675cc4 Wielding now works again
Rolling now resumes combo states correctly again
Cleanup
2021-03-14 17:26:55 -04:00