d5f0ee2fc5
create fn generate_biome in namegen
2022-01-16 16:40:22 +01:00
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
7ae8ed09f6
Addressed MR comments.
2022-01-15 21:50:27 -05:00
4d3b0736d0
Fixed bug with returning to general combat skill tree.
2022-01-15 21:49:30 -05:00
aaa33c6834
Fixed display of some stats in dary and changelog entry.
2022-01-15 21:49:29 -05:00
e662946130
Removed placeholder abilities, tweaked migration.
2022-01-15 21:49:29 -05:00
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
27c9f702db
Fixed issue with character creation referencing incorrect table in database
2022-01-15 21:49:28 -05:00
19a1a0adb2
Changed to using slot maker for ability slots
2022-01-15 21:49:25 -05:00
fe80e365fa
Changed persistence of abilities to go through an intermediate state in json models.
2022-01-15 21:46:57 -05:00
6d0913bb5e
visuals
2022-01-15 21:46:57 -05:00
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
70d6f3a854
Scroll through all aiblities in the same pages.
2022-01-15 21:46:56 -05:00
3870688717
Pages to swap between weapon abilities.
2022-01-15 21:46:55 -05:00
ed38272d23
Diary stats now use real values.
2022-01-15 21:46:55 -05:00
eb0bed39e8
stats window WIP
2022-01-15 21:46:54 -05:00
7515c26d68
progress
2022-01-15 21:46:54 -05:00
714e080535
Abilities can now be dragged to slot to be equipped.
2022-01-15 21:46:53 -05:00
d0e487da8a
Ability sets now start with non-empty defaults.
2022-01-15 21:45:27 -05:00
4c3771a1a0
Persistence of auxiliary abilities.
2022-01-15 21:42:34 -05:00
d86692c4fe
Added in-memory persistence of ability sets per weapon kind pair.
2022-01-15 21:42:34 -05:00
89bf41574c
diary section buttons
2022-01-15 21:42:33 -05:00
ee5293c64e
Abilities scrollable now.
2022-01-15 21:42:33 -05:00
cf724bd76c
Initial UI work
2022-01-15 21:42:32 -05:00
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
9b6c76bd3b
Removed health scaling that bypasses the skill system.
2022-01-15 11:58:28 -05:00
a6d1bfa6a0
Merge branch 'isse/site2-util' into 'master'
...
Site2 util
See merge request veloren/veloren!3037
2022-01-15 13:06:18 +00:00
5642680687
Site2 util
2022-01-15 13:06:18 +00:00
4b1900d3ea
Merge branch 'fix-hotbar-bug' into 'master'
...
Fix hotbar bug
See merge request veloren/veloren!3066
2022-01-15 01:37:27 +00:00
3afa16bf03
Fix hotbar changing when sorting inventory.
...
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
a33e6df303
Remove unused code.
2022-01-14 18:23:42 +01:00
589189315c
Merge branch 'slipped/gnarlingstuff' into 'master'
...
gnarling depth
See merge request veloren/veloren!3068
2022-01-14 07:22:11 +00:00
1e24e4b8fb
Merge branch 'YuriMomo/Fix-Report-Message' into 'master'
...
Fix-Report-Message
See merge request veloren/veloren!3096
2022-01-14 06:17:55 +00:00
0e9d50162b
last fixes
2022-01-14 00:19:32 -05:00
475fc1631f
akhlut
2022-01-13 23:20:58 -05:00
1fac6359de
more gnarling weapons
2022-01-13 23:20:56 -05:00
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -05:00
c8f083aa44
Thank you clippy, very cool
2022-01-13 12:31:51 -06:00
167c9b2113
Test for cyclic skill dependencies
2022-01-13 12:21:11 -06:00
87769e7e55
Merge branch 'sam/damage-types' into 'master'
...
Physical damage types now have effects
See merge request veloren/veloren!3087
2022-01-13 03:55:44 +00:00
a882cb6af4
Changelog
2022-01-12 22:21:55 -05:00
8c2a484ee5
Addressed review comments.
2022-01-12 22:19:00 -05:00
c8f8ccdc55
Buffed spin for whatever strange reason
2022-01-12 22:18:59 -05:00
e98edbcc7a
Conversion of poise damage to health damage now scales depending on the poise state the target is in.
...
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
2022-01-12 22:18:59 -05:00
2e2e56661f
Tweaked poise effects and thresholds.
2022-01-12 22:18:59 -05:00
f182eec611
Fixed bugs in piercing penetration and crushing poise damage calculations.
2022-01-12 22:18:58 -05:00
d1e1de3b14
Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
...
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
38e4a41620
Fix-Report-Message
2022-01-11 20:42:05 +01:00
c6fc42be82
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3094
2022-01-10 08:45:47 +00:00
5fcbd1e743
Update swedish translations
2022-01-10 08:45:47 +00:00