Commit Graph

6440 Commits

Author SHA1 Message Date
Samuel Keiffer
d58a72e91b Merge branch 'sam/purge-body-from-stats' into 'master'
Removed body from stats component as there is already a body component.

Closes #931

See merge request veloren/veloren!1714
2021-01-22 23:08:07 +00:00
Sam
4014b28d19 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Joshua Barretto
4b4504a3a3 Merge branch 'swilliams/golem-hitbox-fix' into 'master'
Swilliams/golem hitbox fix

See merge request veloren/veloren!1712
2021-01-22 16:30:35 +00:00
Scott Williams
2a9c4f6f2e Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
Justin Shipsey
6de8ca32ce Merge branch 'sam/lactose-tolerant-golems' into 'master'
Gives golems a spin attack

See merge request veloren/veloren!1709
2021-01-22 07:30:53 +00:00
Snowram
6ee87221e6 Use improved pullback on golem anim 2021-01-22 06:13:43 +01:00
Sam
b5a3b3442c Addressed comments. 2021-01-21 17:45:03 -05:00
Samuel Keiffer
b11122c9b4 Merge branch 'sam/mindflayer-skills' into 'master'
Makes mindflayer not equivalent to a starting character that picked staff

See merge request veloren/veloren!1710
2021-01-21 22:39:33 +00:00
Sam
d2f3c1dd25 Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions. 2021-01-21 14:56:24 -05:00
Snowram
8b06d844f7 Golem spinmelee anim 2021-01-21 01:23:10 +01:00
Sam
aaad5e49cc Changed how it moved golem. 2021-01-20 17:22:24 -05:00
Acrimon
8d25532fcd Merge branch 'acrimon/update-deps-1' into 'master'
update a few deps

See merge request veloren/veloren!1707
2021-01-20 20:07:37 +00:00
Sam
c888ec0535 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00
Acrimon
b464a1876e
update itertools for voxygen 2021-01-20 16:00:08 +01:00
Acrimon
9f16a946ee
update a few deps 2021-01-20 15:53:58 +01:00
Monty Marz
863f390f4d Merge branch 'pfau/ui-hotfix' into 'master'
Pfau/ui hotfix

See merge request veloren/veloren!1703
2021-01-20 11:20:06 +00:00
Monty Marz
1eb7f78189 Revert "Added TR translations for deaths by debuffs."
This reverts commit 0817e45e13.
2021-01-20 11:20:06 +00:00
Justin Shipsey
1b978402c9 Merge branch 'james/footsteps-sfx' into 'master'
Footstep SFX and repetitions based on distance instead of time

See merge request veloren/veloren!1705
2021-01-20 05:05:23 +00:00
jiminycrick
7dda25a66d More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
Snowram
03a1452d16 Merge branch 'Sarrakitty/SFXfix' into 'master'
small sfx fix, adding consume sfx for salads and lettuce

See merge request veloren/veloren!1704
2021-01-20 01:40:59 +00:00
Samuel Keiffer
f438eaa9f3 Merge branch 'sam/disable-player-exp-reward' into 'master'
Players should no longer reward exp on being killed.

See merge request veloren/veloren!1702
2021-01-20 00:53:50 +00:00
Acrimon
6891f9c703 Merge branch 'xvar/ci-stuff' into 'master'
CI: Combined check, code quality and unit tests into single step

See merge request veloren/veloren!1682
2021-01-19 22:22:57 +00:00
Samuel Keiffer
27796aac4e Merge branch 'james/fix-biped-large-roll' into 'master'
Make only humanoid agents attempt to roll

See merge request veloren/veloren!1701
2021-01-19 21:37:48 +00:00
Sarra
f12e9f1665 small sfx fix, adding consume sfx for salads and lettuce 2021-01-19 16:24:44 -05:00
Acrimon
6f82ac352d Merge branch 'acrimon/build-tip' into 'master'
Add a tip about the build command

See merge request veloren/veloren!1699
2021-01-19 20:45:26 +00:00
Sam
221dfc0ffa Players should no longer reward exp on being killed. 2021-01-19 15:27:56 -05:00
Ben Wallis
a590595149
Merged check and unit tests into single step
Reordered commands to run quickest first in order to tie up least CI resource
Fixed some clippy errors in examples
2021-01-19 19:58:51 +01:00
jiminycrick
08922dfc64 Make only humanoid agents attempt to roll 2021-01-19 10:42:46 -08:00
Acrimon
12e66faf57 Merge branch 'Sarrakitty/RotsysItemSprites' into 'master'
Sarrakitty/rotsys item sprites

See merge request veloren/veloren!1695
2021-01-19 18:23:44 +00:00
Sarra Kitty
e7d852835c Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Acrimon
21ecb15571
build tip 2021-01-19 19:02:41 +01:00
Samuel Keiffer
b04158c5f9 Merge branch 'sam/combat-skill-trees' into 'master'
Sam/combat skill trees

See merge request veloren/veloren!1680
2021-01-19 14:18:07 +00:00
Monty Marz
ac60bf5794 Better visuals for skill button labels, don't show "0 EXP" in the SCT
Made functions that were called every frame significantly cheaper.

Final UI fixes.
2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea Skills are now factored into combat rating. New formula for exp scaling per SP.
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
2021-01-19 08:08:26 -05:00
jshipsey
0b156542e4 roll keyframes
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
5d1993009f keyframed axe spin
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Monty
5362000de4 adjusted potions, refined level up message animation
fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
2021-01-19 08:08:14 -05:00
Monty Marz
de5c5702b3 stats display
Addressed comments.

Addressed comments.
2021-01-19 08:08:11 -05:00
Sam
c809569f6b Added level up sound to skill point gain. Fixed tests.
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
3d44ac2c35 Humanoid skill config and AI skill check
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00
Noé
acbd965e65 implemented en translation for Hammer, Bow, Scepter and Staff skills
skill tree translation

Clamped earning SP to avoid u16 overflow.

translation fixes

Fixed exp scaling function

Fixed exp scaling function

remove debug combat rating display

Update overhead.rs

implemented en translation for Axe
2021-01-19 08:08:02 -05:00
Sam
a606313856 Added scaling exp costs per skill point.
Fix tooltip being red.

multiple fixes, started translation

change exp giving items
adjust loot tables
adjust combat rating indicators
fix group frame offsets
2021-01-19 08:07:57 -05:00
Sam
6ce422748c Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
968b66260e Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
83fdc8806d Added function to automatically generate a combat rating. Currently, it is used to calculate exp. 2021-01-19 08:07:54 -05:00
Sam
4f552a736e Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00
Sam
ae8c8b47f1 Added tooltips with numbers. Balancing on some skills.
Added experience scaling for tougher enemies.
2021-01-19 08:07:51 -05:00
Sam
89766b2b34 Added command to give yourself skill points.
adjusted social window

Changelog
2021-01-19 08:07:49 -05:00
Sam
986c05621a Wired up skill UI to check for prerequisites being met and sufficient skill points.
available SP check in general HUD, more skill icons

Trimmed 2000 lines from a file.

UI tweaks
2021-01-19 08:07:45 -05:00
Sam
4b52574750 Skill point gains are displayed in hud.
level up message visuals and functionality

Handles simultaneous skill point gains in UI.
2021-01-19 08:07:41 -05:00