2722 Commits

Author SHA1 Message Date
Ludvig Böklin
b151f88b63 Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot 2021-02-09 13:52:03 +01:00
Ludvig Böklin
a888cd00d5 Redefine Ori as a quaternion 2021-02-05 09:33:14 +01:00
James Melkonian
8951e427e4 Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60276ddcb5 Added snow particles 2021-01-31 15:15:17 +00:00
DaforLynx
e01288b787 Aughihopethisworks 2021-01-30 22:27:12 -08:00
Marcel
afeb1621be Merge branch 'DaforLynx/small-sound-fixes' into 'master'
Small audio fixes; addresses #939 and #940

Closes #940 and #939

See merge request veloren/veloren!1739
2021-01-29 11:37:10 +00:00
DaforLynx
1d6676fb98 Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
jiminycrick
ae8722794b Address some comments
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jiminycrick
53b43e9812 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
jshipsey
1b0bf21775 animal stuns
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
1fadcf51ba Some preliminary balancing
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
95c3af1123 starting stun anim
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
jiminycrick
64a3c16999 Update rand dependency 2021-01-26 20:35:08 -08:00
Entropy9s
1c6851c5d1 StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Scott Williams
3adb9f9f03 All gems make a sound. 2021-01-25 22:53:23 +00:00
Scott Williams
95c67cbfbd Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Justin Shipsey
1742933bc5 Merge branch 'pfau/sceptres' into 'master'
6 new sceptres, add DPS display to tooltips

See merge request veloren/veloren!1724
2021-01-24 03:14:32 +00:00
Marcel
7c6ce75e6b Merge branch 'torvus-quick-fix' into 'master'
Fix torvus

See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
Monty
b853fecf61 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
Samuel Keiffer
ac87cb7155 Merge branch 'sam/skill-balancing-1' into 'master'
Skill balancing

See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
Sam
1ee7cc4760 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
Imbris
fd49debc90 Merge branch 'imbris/update-winit' into 'master'
Update winit and iced

See merge request veloren/veloren!1717
2021-01-23 09:22:58 +00:00
Imbris
ad714151b4 Merge branch 'pizzaluc/unlimited_FPS' into 'master'
Implemented #896 - Added option for Unlimited FPS

Closes #896

See merge request veloren/veloren!1713
2021-01-23 08:34:38 +00:00
Lucas Vulpius
92c0d43169 Implemented #896 - Added option for Unlimited FPS 2021-01-23 08:34:38 +00:00
Justin Shipsey
ceccdecb47 Merge branch 'Rotsuoy/SavannaGrass' into 'master'
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
Rotsuoy
212ee4b407 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Imbris
e818403dcb Update winit and iced 2021-01-23 01:09:33 -05:00
Sam
2a6f1236d4 Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
020e4acba4 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Justin Shipsey
9bc7ad453f 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
9163ddc5fe Use improved pullback on golem anim 2021-01-22 06:13:43 +01:00
Sam
7b7eab4fd6 Addressed comments. 2021-01-21 17:45:03 -05:00
Snowram
43a8d2c06a Golem spinmelee anim 2021-01-21 01:23:10 +01:00
Acrimon
99bad0dcc6
update itertools for voxygen 2021-01-20 16:00:08 +01:00
Acrimon
97bec6e012
update a few deps 2021-01-20 15:53:58 +01:00
Monty Marz
3b01a888da Revert "Added TR translations for deaths by debuffs."
This reverts commit 0817e45e131b70dbd7ef8bee768ccc377301b5d7.
2021-01-20 11:20:06 +00:00
jiminycrick
18b981bd45 More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
Monty Marz
88a8814fe7 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
467ed6d7d3 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
91c243fd8d roll keyframes
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
2866091d7b 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
decef1d1a4 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
5e55984595 stats display
Addressed comments.

Addressed comments.
2021-01-19 08:08:11 -05:00
Sam
1ea9335c40 Added level up sound to skill point gain. Fixed tests.
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
92b72d94ba Humanoid skill config and AI skill check
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00
Noé
455ebf983c 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
ad73ef5c39 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
21220088d8 Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
e511a31780 Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
933a413879 Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00