Commit Graph

11022 Commits

Author SHA1 Message Date
64f6faece5 Switched to using existing swap_lantern function
Removed unnecessary function
2022-01-17 11:24:18 -08:00
0c97a6e91a add synonyms for biomes 2022-01-17 20:14:16 +01:00
9b85a01df6 Merge branch 'inputmeta' into 'master'
Add Input methods to metainfo.xml

See merge request veloren/veloren!3093
2022-01-17 18:30:28 +00:00
88a39476bc tweak fn generate_biome in namegen 2022-01-17 19:03:15 +01:00
b9ad0307b5 idek where most of these came from 2022-01-17 10:50:18 -06:00
fa6e5f2cec Add a comment explaining something unintuitive 2022-01-17 10:39:58 -06:00
b8a12b582d Revert "Thank you clippy, very cool"
This reverts commit c8f083aa44.
2022-01-17 10:18:32 -06:00
860f802afa Add Gamepad to supported controls 2022-01-17 15:09:03 +00:00
609d23ae4f - make individual size thresholds for biome name generation to include small lakes
- add original Lake naming pattern, partly (no water_alt check)
2022-01-17 16:02:52 +01:00
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master'
Mount Everest

See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
60b7528199 Improved rtsim entity pathfinding 2022-01-17 12:34:31 +00:00
1d76d484bb anim tweaks 2022-01-17 06:45:26 -05:00
ced1a82824 - add size threshold for biomes to name, to exclude mini-biomes from clogging the map.
- fmt, clippy
2022-01-17 11:19:34 +01:00
c9762568d6 Don't block teleportation when mounted 2022-01-17 09:47:29 +00:00
d0c101ed06 Remove redundant orientation 2022-01-17 09:25:46 +00:00
41ed0f284f swivel, quadsmall/quadlow offsets 2022-01-17 03:42:56 -05:00
18c434c613 tweak generate_biome 2022-01-17 09:04:12 +01:00
c00f5bafee add fn generate_forest in namegen to name forest biomes 2022-01-17 08:36:35 +01:00
8078ed39e1 Merge branch 'kemper/negative-energy-diffs' into 'master'
Fix energy stat comparisons with negative diffs in item tooltips

See merge request veloren/veloren!3109
2022-01-17 05:54:18 +00:00
6f0f43917d Fix negative energy stat comparisons in item tooltips 2022-01-17 05:18:21 +00:00
889a593b13 cargo fmt 2022-01-16 16:32:03 -08:00
fc012b4989 Lantern color will now change when swapping lanterns while lantern is activated 2022-01-16 16:24:31 -08:00
ccfa4da059 Merge branch 'sam/actually-remove-health-scaling' into 'master'
Removed health sclaing from summon character state

See merge request veloren/veloren!3105
2022-01-17 00:04:04 +00:00
Sam
bc402dd1b2 Changed then_some to then 2022-01-16 18:36:46 -05:00
Sam
31a894601f Removed health sclaing from summon character state. 2022-01-16 18:18:23 -05:00
3b7ea72a9c Fixed review comments 2022-01-16 21:13:13 +00:00
f306e01433 Merge branch 'fix-loot-forcing' into 'master'
Fix loot forcing

Closes #1309

See merge request veloren/veloren!3104
2022-01-16 21:12:59 +00:00
5da2850624 Fix loot forcing 2022-01-16 21:12:59 +00:00
0ea1e6862e animation tweaking 2022-01-16 15:46:17 -05:00
5ad8501cc8 update bricks in fn generate_biome in namegen, tweaks
WIP
2022-01-16 21:22:12 +01:00
7f3d9898db More sensible turn rate in air 2022-01-16 19:43:13 +00:00
5b9f405671 Better placement of poi and actual names 2022-01-16 20:28:53 +01:00
20509a7818 Removed mounted combat edge cases 2022-01-16 19:28:53 +00:00
ed9de26f27 jump anim, quad med 2022-01-16 14:09:55 -05:00
5008dba413 Sensibly filter mount inputs 2022-01-16 18:45:27 +00:00
2966a42093 Added mounted combat 2022-01-16 18:30:00 +00:00
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
043016a433 Don't try to mount unmountable entities, clippy fixes and fmt 2022-01-16 17:53:14 +00:00
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
f33c12e976 Remove unnecessary interpolation cruft 2022-01-16 17:53:14 +00:00
157cd6cd14 Fixed unusual speech bubble placement 2022-01-16 17:53:14 +00:00
2923d3cd2b Made NPCs prefer food when idle 2022-01-16 17:53:13 +00:00
5c37786185 Improved interpolation for riders 2022-01-16 17:53:13 +00:00
6931514ae5 Made teleport commands redirect to mount 2022-01-16 17:53:13 +00:00
537cc38b5e Fixed lantern position when mounting 2022-01-16 17:53:13 +00:00
b3e2d825ed Overhauled mounting to make it more reliable 2022-01-16 17:53:13 +00:00
f8d94ef25f biome name to chunk name 2022-01-16 18:11:22 +01:00
37c14037cb Merge branch 'fix-chat-after-char-switch' into 'master'
Fix issue with chat after char selection

See merge request veloren/veloren!3103
2022-01-16 16:58:54 +00:00
3f5c9dcd13 Fix issue with chat after char selection 2022-01-16 17:22:55 +01:00
5bd7507f31 Added poi for all biomes 2022-01-16 16:54:49 +01:00