Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,964 Commits 151 Branches 18 Tags 2.1 GiB
00e9711429
Commit Graph

10964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
floppy
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
Joshua Barretto
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master' 
Mount Everest

See merge request veloren/veloren!3101
 2022-01-17 13:21:38 +00:00
Joshua Barretto
60b7528199 Improved rtsim entity pathfinding 2022-01-17 12:34:31 +00:00
jshipsey
1d76d484bb anim tweaks 2022-01-17 06:45:26 -05:00
floppy
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
Joshua Barretto
c9762568d6 Don't block teleportation when mounted 2022-01-17 09:47:29 +00:00
Joshua Barretto
d0c101ed06 Remove redundant orientation 2022-01-17 09:25:46 +00:00
jshipsey
41ed0f284f swivel, quadsmall/quadlow offsets 2022-01-17 03:42:56 -05:00
floppy
18c434c613 tweak generate_biome 2022-01-17 09:04:12 +01:00
floppy
c00f5bafee add fn generate_forest in namegen to name forest biomes 2022-01-17 08:36:35 +01:00
Imbris
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
Kemper
6f0f43917d Fix negative energy stat comparisons in item tooltips 2022-01-17 05:18:21 +00:00
ninefox
889a593b13 cargo fmt 2022-01-16 16:32:03 -08:00
ninefox
fc012b4989 Lantern color will now change when swapping lanterns while lantern is activated 2022-01-16 16:24:31 -08:00
Samuel Keiffer
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
Joshua Barretto
3b7ea72a9c Fixed review comments 2022-01-16 21:13:13 +00:00
Joshua Barretto
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
terrarier2111
5da2850624 Fix loot forcing 2022-01-16 21:12:59 +00:00
jshipsey
0ea1e6862e animation tweaking 2022-01-16 15:46:17 -05:00
floppy
5ad8501cc8 update bricks in fn generate_biome in namegen, tweaks 
WIP
 2022-01-16 21:22:12 +01:00
Joshua Barretto
7f3d9898db More sensible turn rate in air 2022-01-16 19:43:13 +00:00
IsseW
5b9f405671 Better placement of poi and actual names 2022-01-16 20:28:53 +01:00
Joshua Barretto
20509a7818 Removed mounted combat edge cases 2022-01-16 19:28:53 +00:00
jshipsey
ed9de26f27 jump anim, quad med 2022-01-16 14:09:55 -05:00
Joshua Barretto
5008dba413 Sensibly filter mount inputs 2022-01-16 18:45:27 +00:00
Joshua Barretto
2966a42093 Added mounted combat 2022-01-16 18:30:00 +00:00
Joshua Barretto
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
Joshua Barretto
043016a433 Don't try to mount unmountable entities, clippy fixes and fmt 2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Joshua Barretto
f33c12e976 Remove unnecessary interpolation cruft 2022-01-16 17:53:14 +00:00
Joshua Barretto
157cd6cd14 Fixed unusual speech bubble placement 2022-01-16 17:53:14 +00:00
Joshua Barretto
2923d3cd2b Made NPCs prefer food when idle 2022-01-16 17:53:13 +00:00
Joshua Barretto
5c37786185 Improved interpolation for riders 2022-01-16 17:53:13 +00:00
Joshua Barretto
6931514ae5 Made teleport commands redirect to mount 2022-01-16 17:53:13 +00:00
Joshua Barretto
537cc38b5e Fixed lantern position when mounting 2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed Overhauled mounting to make it more reliable 2022-01-16 17:53:13 +00:00
IsseW
f8d94ef25f biome name to chunk name 2022-01-16 18:11:22 +01:00
Joshua Barretto
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
threadexception
3f5c9dcd13 Fix issue with chat after char selection 2022-01-16 17:22:55 +01:00
IsseW
5bd7507f31 Added poi for all biomes 2022-01-16 16:54:49 +01:00
floppy
d5f0ee2fc5 create fn generate_biome in namegen 2022-01-16 16:40:22 +01:00
Samuel Keiffer
dd612a9473 Merge branch 'sam/ability_selection' into 'master' 
Ability Selection UI

Closes #419, #421, and #1431

See merge request veloren/veloren!3031
 2022-01-16 03:19:21 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
4d3b0736d0 Fixed bug with returning to general combat skill tree. 2022-01-15 21:49:30 -05:00
Sam
aaa33c6834 Fixed display of some stats in dary and changelog entry. 2022-01-15 21:49:29 -05:00
Sam
e662946130 Removed placeholder abilities, tweaked migration. 2022-01-15 21:49:29 -05:00
Sam
745cc20c66 Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode. 2022-01-15 21:49:28 -05:00
Sam
27c9f702db Fixed issue with character creation referencing incorrect table in database 2022-01-15 21:49:28 -05:00