Commit Graph

9594 Commits

Author SHA1 Message Date
2fc62bfe7f Make each race's hitbox and weight scale linearly with their height
This causes all humanoids to handle identically when falling, gliding, or swimming
2021-08-09 10:06:16 +01:00
ebf489984c Improve gliding
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
2021-08-09 10:06:16 +01:00
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients
Increase glider zero-lift drag
2021-08-09 10:06:15 +01:00
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
7c8c0973a8 Merge branch 'xvar/fixes' into 'master'
Fixed issue caused by Uid component being removed too soon on logout

See merge request veloren/veloren!2746
2021-08-08 14:29:14 +00:00
7039bf7a0c Fixed issue caused by Uid component being removed too soon on logout 2021-08-08 14:59:11 +01:00
9bfd396c36 Merge branch 'ubruntu/relative-xp-curve' into 'master'
XP reward curve modified for faster gain at lower levels

See merge request veloren/veloren!2706
2021-08-08 03:34:57 +00:00
dca795e533 XP reward curve modified for faster gain at lower levels 2021-08-08 03:34:56 +00:00
c6df38cc9d Merge branch 'juliancoffee/beam_agents' into 'master'
Expose beam_offsets to AI

See merge request veloren/veloren!2744
2021-08-08 03:34:53 +00:00
f16f8182cd Add FIXME about Staff flamethrower 2021-08-08 00:41:39 +03:00
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
2b10f818f5 Merge branch 'juliancoffee/pillar_fix' into 'master'
Nerf pillars + Fix Beam ori

See merge request veloren/veloren!2732
2021-08-07 16:35:24 +00:00
f3fdfc37d7 Merge branch 'juliancoffee/gliding_debug' into 'master'
Gliding Debug Info

See merge request veloren/veloren!2743
2021-08-07 13:19:58 +00:00
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
fab5c54253 Merge branch 'juliancoffee/egui_setting' into 'master'
Egui toggle

See merge request veloren/veloren!2742
2021-08-06 21:13:17 +00:00
3411ccc7ee Shift egui debug window right 2021-08-06 22:58:36 +03:00
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
abf5a7e136 Add option to toggle egui debug 2021-08-06 22:58:36 +03:00
e99a885bfe Merge branch 'juliancoffee/asset_tweak_v2' into 'master'
asset_tweak v2

See merge request veloren/veloren!2723
2021-08-06 17:41:54 +00:00
ea5de81f9b UI: Fixes and enhancements to trading window 2021-08-06 17:11:54 +03:00
69242c0598 Merge branch 'xMAC94x/translationfix' into 'master'
write header only once

See merge request veloren/veloren!2741
2021-08-06 13:07:49 +00:00
6b0fe3ae75 Merge branch 'juliancoffee/normalize_mass' into 'master'
Normalize masses in range 75-100.

See merge request veloren/veloren!2740
2021-08-06 11:53:52 +00:00
bdce07e7a0 Adress review, add test for structs 2021-08-06 13:04:01 +03:00
c956ca1863 write header only once 2021-08-06 12:02:22 +02:00
c0f3dfe6bd Normalize masses in range 75-100.
+ Remove match on body_type
2021-08-06 11:57:42 +03:00
4029d4a720 Change beam offsets
* Make it so that beam starts from inside hitbox of owner.
Without it it's possible to cheese beem attack just making close enough
to its owner.
2021-08-05 21:07:46 +03:00
3386805765 Give TrainingDummy hitbox 2021-08-05 21:07:46 +03:00
8a83ecf57f Fix Beam orientation, remove orientation_behavior
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
2021-08-05 21:07:46 +03:00
edd37ad491 Agent code TODO-s 2021-08-05 21:07:45 +03:00
fadf53a6ba Nerf pillars
* make platforms one block high
2021-08-05 21:07:45 +03:00
c855b14b14 Merge branch 'lboklin/idle-upright' into 'master'
Make character upright itself even while idle

See merge request veloren/veloren!2733
2021-08-05 12:36:28 +00:00
cbd7c4481c Make character upright itself even while idle 2021-08-05 08:34:21 +02:00
92b32b4c36 Merge branch 'ygor/fix-axe-energy-reward' into 'master'
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
2021-08-05 00:38:41 +00:00
97f87be44f Merge branch 'capucho/derivative-fix' into 'master'
Don't use derivatives in vertex shader

See merge request veloren/veloren!2731
2021-08-05 00:37:04 +00:00
c4214fedbe Don't use derivatives in vertex shader 2021-08-04 23:14:08 +01:00
a465813965 Merge branch 'zesterer/agent-fixes' into 'master'
Added action timer system for agent code

See merge request veloren/veloren!2726
2021-08-04 16:17:49 +00:00
665951946f Fixed block snapping 2021-08-04 14:12:10 +01:00
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +01:00
33e9bc79e3 Merge branch 'zesterer/fix-pets' into 'master'
Fix pets without agency

See merge request veloren/veloren!2728
2021-08-04 00:25:04 +00:00
8822c6409e Fix pets without agency 2021-08-04 00:22:03 +01:00
f4e04ecefc Merge branch 'juliancoffee/handle_pvp' into 'master'
Handle PvP/PvE

See merge request veloren/veloren!2686
2021-08-03 21:09:09 +00:00
c316960b3f Merge branch 'umr1352/fix#1260' into 'master'
fix issue #1260: give a warning if an error occurs on language files load

Closes #1260

See merge request veloren/veloren!2724
2021-08-03 21:09:06 +00:00
cae8005a18 fix issue #1260: give a warning if an error occurs on language files load 2021-08-03 21:09:05 +00:00
32894065e9 Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): fix nix builds

Closes #1132

See merge request veloren/veloren!2720
2021-08-03 21:09:04 +00:00
4766450258 Avoid negative bounds in harm checks
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
2021-08-03 18:57:53 +03:00
aa371147e7 build: update keyboard-keynames 2021-08-03 18:16:55 +03:00
88eca50c36 docs(nix): add notice for vulkan driver error potentially relating to nixpkgs mismatches 2021-08-03 17:45:42 +03:00
521b2bf46b build(nix): remove useless override (upstreamed), fix crate name 2021-08-03 17:45:41 +03:00
3952d8b86f chore(deps): update nix flake deps 2021-08-03 17:45:41 +03:00
44916383c6 continue -> filter_map to handle new players 2021-08-03 16:43:56 +03:00