Commit Graph

2881 Commits

Author SHA1 Message Date
Oresavna
c885aa3607 Add WindUpdate and WindRequest messages 2021-06-22 15:45:31 +02:00
Ludvig Böklin
eddc967462 Fix GlideWield overriding state changes 2021-06-22 11:20:40 +02:00
Ludvig Böklin
8a987b8de1 Undo gravity hack and set gravity to 1G again 2021-06-22 10:32:10 +02:00
Ludvig Böklin
4e3453301b Improve glider rotation 2021-06-22 10:32:10 +02:00
Ludvig Böklin
1022477713 Maybe fix glider flip 2021-06-22 10:32:10 +02:00
Ludvig Böklin
4568a7a38f Hack custom gravity of 1G while gliding 2021-06-22 10:32:10 +02:00
Ludvig Böklin
262b91a14e Tweak glider controls
Adjust base glider pitch
2021-06-22 10:32:09 +02:00
Ludvig Böklin
fb4edef4f8 Set GRAVITY to 25.0 as in master and adjust drag reference area scale to compensate 2021-06-22 10:32:09 +02:00
Ludvig Böklin
fa24a5c317 Remove timed input easing after started gliding 2021-06-22 10:32:09 +02:00
Ludvig Böklin
56dfd5a4ff Glider dist based on char height 2021-06-22 10:32:09 +02:00
Ludvig Böklin
b62177e091 Don't remove all negative lift 2021-06-22 10:32:09 +02:00
Ludvig Böklin
c1ecc8374b Ease glider roll 2021-06-22 10:32:09 +02:00
Ludvig Böklin
dbffd90f0e Prevent rotation from negative lift and fix glider ori in wield state 2021-06-22 10:32:09 +02:00
Ludvig Böklin
6f2f27e993 Fix issue with nonsensical glider roll 2021-06-22 10:32:09 +02:00
Ludvig Böklin
94bfa1c72a Keep character standing up while on ground 2021-06-22 10:32:09 +02:00
Ludvig Böklin
61233fd59d Don't reset ori when exiting glide state and misc tweaks 2021-06-22 10:32:09 +02:00
Ludvig Böklin
9e20b090c4 Implement aerodynamic GlideWield 2021-06-22 10:32:09 +02:00
Ludvig Böklin
df666cef40 Improve glider controls; physics-based heuristic for character ori 2021-06-22 10:31:56 +02:00
Ludvig Böklin
208438a26c Add some util functions to Ori 2021-06-22 10:31:41 +02:00
Ludvig Böklin
74f9945ab3 Refactor and abstract fluid dynamics 2021-06-22 10:31:40 +02:00
Ludvig Böklin
5f44101486 Define humanoid dimensions as measured in-game
Make Body::dimensions and Body::height methods const

Modify humanoid dimensions for calculation of drag
2021-06-22 10:24:54 +02:00
Ludvig Böklin
986b413521 Sort cases in mass match 2021-06-22 10:23:42 +02:00
Treeco
856e3849f7 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-22 10:23:41 +02: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
juliancoffee
384409a1ed Load ori_rate for BasicBeam from assets
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
juliancoffee
9a5f749bc7 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
46dfc119fb Merge branch 'aweinstock/tighten_e2t' into 'master'
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
2021-06-18 16:27:20 +00:00
Joshua Barretto
05c375a8b0 Merge branch 'zesterer/meta' into 'master'
Optimising for size

See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
Joshua Barretto
747ef50a58 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
0265da1074 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
bb6e8582a6 Merge branch 'zesterer/no-cmd-santisation' into 'master'
Made dealing with chat vs commands safer for clients, made /alias require moderator permissions

See merge request veloren/veloren!2472
2021-06-18 10:55:57 +00:00
Joshua Barretto
294b6e394a Renamed command event 2021-06-18 11:31:06 +01:00
juliancoffee
288a7a020b Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
Joshua Barretto
0067cea560 Made /alias moderator-only 2021-06-17 19:55:46 +01:00