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,693 Commits 151 Branches 18 Tags 2.1 GiB
38bbd60fd2
Commit Graph

10693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kemper
6f0f43917d Fix negative energy stat comparisons in item tooltips 2022-01-17 05:18:21 +00: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
Joshua Barretto
7f3d9898db More sensible turn rate in air 2022-01-16 19:43:13 +00: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
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
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
Sam
19a1a0adb2 Changed to using slot maker for ability slots 2022-01-15 21:49:25 -05:00
Sam
fe80e365fa Changed persistence of abilities to go through an intermediate state in json models. 2022-01-15 21:46:57 -05:00
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -05:00
Sam
d1c5d3e020 If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand. 2022-01-15 21:46:56 -05:00
Sam
70d6f3a854 Scroll through all aiblities in the same pages. 2022-01-15 21:46:56 -05:00
Sam
3870688717 Pages to swap between weapon abilities. 2022-01-15 21:46:55 -05:00
Sam
ed38272d23 Diary stats now use real values. 2022-01-15 21:46:55 -05:00
Monty Marz
eb0bed39e8 stats window WIP 2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68 progress 2022-01-15 21:46:54 -05:00
Sam
714e080535 Abilities can now be dragged to slot to be equipped. 2022-01-15 21:46:53 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0 Persistence of auxiliary abilities. 2022-01-15 21:42:34 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -05:00
Sam
ee5293c64e Abilities scrollable now. 2022-01-15 21:42:33 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Samuel Keiffer
7b7ad62be9 Merge branch 'sam/remove-fake-health' into 'master' 
Removed health scaling from generation

Closes #1354

See merge request veloren/veloren!3100
 2022-01-15 22:34:48 +00:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00