Commit Graph

9494 Commits

Author SHA1 Message Date
juliancoffee
4069a381c5 Make Frenzied buff again 2021-08-09 13:05:00 +03:00
juliancoffee
58cfd690c3 Complete skill preset "max" with sceptre HDuration 2021-08-09 10:09:12 +01:00
Treeco
a48fa0f349 Buff swim thrust for humans reduce gains from skillpoints
This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when skilled
However, this turns out to be horrifically fps-dependant, both after this branch and in master. Needs further research into fixes
This commit tunes it for 60 fps
2021-08-09 10:06:16 +01:00
Treeco
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
Ludvig Böklin
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
Ludvig Böklin
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients
Increase glider zero-lift drag
2021-08-09 10:06:15 +01:00
Ben Wallis
7039bf7a0c Fixed issue caused by Uid component being removed too soon on logout 2021-08-08 14:59:11 +01:00
Samuel Keiffer
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
ubruntu
dca795e533 XP reward curve modified for faster gain at lower levels 2021-08-08 03:34:56 +00:00
Samuel Keiffer
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
juliancoffee
f16f8182cd Add FIXME about Staff flamethrower 2021-08-08 00:41:39 +03:00
juliancoffee
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
Samuel Keiffer
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
Marcel
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
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
Ben Wallis
fab5c54253 Merge branch 'juliancoffee/egui_setting' into 'master'
Egui toggle

See merge request veloren/veloren!2742
2021-08-06 21:13:17 +00:00
juliancoffee
3411ccc7ee Shift egui debug window right 2021-08-06 22:58:36 +03:00
juliancoffee
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
juliancoffee
abf5a7e136 Add option to toggle egui debug 2021-08-06 22:58:36 +03:00
Imbris
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
Marcel
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
Samuel Keiffer
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
juliancoffee
bdce07e7a0 Adress review, add test for structs 2021-08-06 13:04:01 +03:00
Marcel Märtens
c956ca1863 write header only once 2021-08-06 12:02:22 +02:00
juliancoffee
c0f3dfe6bd Normalize masses in range 75-100.
+ Remove match on body_type
2021-08-06 11:57:42 +03:00
juliancoffee
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
juliancoffee
3386805765 Give TrainingDummy hitbox 2021-08-05 21:07:46 +03:00
juliancoffee
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
juliancoffee
edd37ad491 Agent code TODO-s 2021-08-05 21:07:45 +03:00
juliancoffee
fadf53a6ba Nerf pillars
* make platforms one block high
2021-08-05 21:07:45 +03:00
Samuel Keiffer
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
Ludvig Böklin
cbd7c4481c Make character upright itself even while idle 2021-08-05 08:34:21 +02:00
Samuel Keiffer
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
Imbris
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
João Capucho
c4214fedbe
Don't use derivatives in vertex shader 2021-08-04 23:14:08 +01:00
Joshua Barretto
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
Joshua Barretto
665951946f Fixed block snapping 2021-08-04 14:12:10 +01:00
Joshua Barretto
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +01:00
Joshua Barretto
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
Joshua Barretto
8822c6409e Fix pets without agency 2021-08-04 00:22:03 +01:00
Joshua Barretto
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
Marcel
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
Enrico Marconi
cae8005a18 fix issue #1260: give a warning if an error occurs on language files load 2021-08-03 21:09:05 +00:00
Marcel
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
juliancoffee
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
Yusuf Bera Ertan
aa371147e7
build: update keyboard-keynames 2021-08-03 18:16:55 +03:00
Yusuf Bera Ertan
88eca50c36
docs(nix): add notice for vulkan driver error potentially relating to nixpkgs mismatches 2021-08-03 17:45:42 +03:00
Yusuf Bera Ertan
521b2bf46b
build(nix): remove useless override (upstreamed), fix crate name 2021-08-03 17:45:41 +03:00
Yusuf Bera Ertan
3952d8b86f
chore(deps): update nix flake deps 2021-08-03 17:45:41 +03:00
juliancoffee
44916383c6 continue -> filter_map to handle new players 2021-08-03 16:43:56 +03:00