Commit Graph

2892 Commits

Author SHA1 Message Date
Ludvig Böklin
07dda3be22 Glider vortices PoC particle effects 2021-06-26 11:41:12 +02:00
Ludvig Böklin
34d264c413 Fix rebase 2021-06-26 11:40:43 +02:00
Ludvig Böklin
09bb35075b Fix GlideWield overriding state changes 2021-06-26 11:40:43 +02:00
Ludvig Böklin
1c58288687 Undo gravity hack and set gravity to 1G again 2021-06-26 11:40:43 +02:00
Ludvig Böklin
a23a2a7b92 Improve glider rotation 2021-06-26 11:40:43 +02:00
Ludvig Böklin
29b0aafdad Maybe fix glider flip 2021-06-26 11:40:43 +02:00
Ludvig Böklin
c2b4f926c1 Hack custom gravity of 1G while gliding 2021-06-26 11:40:42 +02:00
Ludvig Böklin
7221a8a113 Tweak glider controls
Adjust base glider pitch
2021-06-26 11:40:42 +02:00
Ludvig Böklin
27c4afbf1b Set GRAVITY to 25.0 as in master and adjust drag reference area scale to compensate 2021-06-26 11:40:42 +02:00
Ludvig Böklin
ddcc86ee08 Remove timed input easing after started gliding 2021-06-26 11:40:42 +02:00
Ludvig Böklin
304f90b49e Glider dist based on char height 2021-06-26 11:40:42 +02:00
Ludvig Böklin
928c966372 Don't remove all negative lift 2021-06-26 11:40:42 +02:00
Ludvig Böklin
f1193f2cae Ease glider roll 2021-06-26 11:40:42 +02:00
Ludvig Böklin
c53a711a91 Prevent rotation from negative lift and fix glider ori in wield state 2021-06-26 11:40:42 +02:00
Ludvig Böklin
798f4b76b0 Fix issue with nonsensical glider roll 2021-06-26 11:40:41 +02:00
Ludvig Böklin
1c1b0b0a8e Keep character standing up while on ground 2021-06-26 11:40:41 +02:00
Ludvig Böklin
87afb58f73 Don't reset ori when exiting glide state and misc tweaks 2021-06-26 11:40:41 +02:00
Ludvig Böklin
1a47c79136 Implement aerodynamic GlideWield 2021-06-26 11:40:41 +02:00
Ludvig Böklin
b0619bbc3f Improve glider controls; physics-based heuristic for character ori 2021-06-26 11:40:40 +02:00
Ludvig Böklin
7721bbe999 Add some util functions to Ori 2021-06-25 07:14:47 +02:00
Ludvig Böklin
ded0374e60 Refactor and abstract fluid dynamics 2021-06-25 07:14:47 +02:00
Ludvig Böklin
84b1e286cb Define humanoid dimensions as measured in-game
Make Body::dimensions and Body::height methods const

Modify humanoid dimensions for calculation of drag
2021-06-25 07:14:47 +02:00
Ludvig Böklin
44a73dffe1 Sort cases in mass match 2021-06-25 07:14:46 +02:00
Treeco
b736a1fe87 Vastly improve glide ratios and soaring capability
Character masses and dimensions have been vastly changed. This is necessary to limit drag - they were practically sails previously.
Character proportions are now closer to those of IRL humans than to their voxel models.
This may screw up entity collision, in which case body dimensions for aerodynamics and for everything else may need to be separated.
Gliders now scale with character size, with a wingspan 3x their height and a chord 1x/3.
Gliding is also now very very fast under 2.5g, but much tamer under Earth gravity. This may need dealing with.
2021-06-25 07:14:45 +02:00
Sam
645cc60dc0 Balance tweaks. 2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397 Added sparseness field to sprite summon. 2021-06-23 22:38:16 -05:00
Sam
68c6a0a495 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555 3 attack anims done 2021-06-23 22:38:16 -05:00
Sam
879aafad5c 3 attacks done 2021-06-23 22:38:16 -05:00
jshipsey
81aaf30d00 stride speed backwardd-dependence 2021-06-22 22:08:34 -04:00
Dominik Broński
8356e2ffca Merge branch 'aweinstock/lava' into 'master'
Lava

See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
e930ff6779 Sanitise controller inputs 2021-06-21 21:13:49 +01:00
Joshua Barretto
90e5bac395 Made movement slower when strafing in non-forward directions 2021-06-21 20:32:20 +01:00
Joshua Barretto
288f2c13d4 Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Marcel
ec7d3b5e37 Merge branch 'swilliams/give_item_fix' into 'master'
Fix for Issue 1210

See merge request veloren/veloren!2484
2021-06-20 23:26:59 +00:00
Marcel
b0574b4ddc Merge branch 'imbris/tracy' into 'master'
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
Scott Williams
80c45b6396 Added another .replace 2021-06-20 22:55:58 +01:00
Avi Weinstock
0f9181cbcb Address MR 2482 comments.
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
Avi Weinstock
f1a1160b80 Make lava solid w.r.t. rendering while still being liquid w.r.t. physics. 2021-06-19 16:52:21 -04:00
Avi Weinstock
2226a4c6a9 Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode. 2021-06-19 16:31:21 -04:00
Samuel Keiffer
e7f54d6306 Merge branch 'juliancoffee/clay_golem_tweak' into 'master'
clay golem tweak

See merge request veloren/veloren!2478
2021-06-19 14:49:11 +00:00
Imbris
659b42e813 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Imbris
2bb91e8d7d Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it 2021-06-19 04:27:50 -04:00
juliancoffee
57649a2e90 tweak clay_golem HP 2021-06-19 10:47:45 +03:00
Samuel Keiffer
2abd23ec64 Merge branch 'juliancoffee/not_explodable_sprites' into 'master'
Proof of concept non-explodable sprites

See merge request veloren/veloren!2475
2021-06-19 01:10:20 +00:00
Samuel Keiffer
0b8039c3b0 Merge branch 'juliancoffee/trade_pricing_refactor' into 'master'
Refactor trade_pricing.rs

See merge request veloren/veloren!2469
2021-06-19 01:10:16 +00:00