Commit Graph

2728 Commits

Author SHA1 Message Date
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
44a9d8dc71 Merge branch 'nward/chat-input-color-icon-rebased' into 'master'
Rebase  !1447  Chat input color and icon reflect channel message is sent to.

See merge request veloren/veloren!1769
2021-02-10 19:42:59 +00:00
63952875d9 Rebase !1447 Chat input color and icon reflect channel message is sent to. 2021-02-10 19:42:59 +00:00
3e98e18c46 Merge branch 'aweinstock/sort-crafting' into 'master'
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
2021-02-10 04:04:42 +00:00
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
357cb26e05 Update native_dialog to 0.5.2 2021-02-07 00:48:57 -05:00
9f7637ab21 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
60c16e57b1 Added snow particles 2021-01-31 15:15:17 +00:00
b906473f4e Aughihopethisworks 2021-01-30 22:27:12 -08:00
b88f04215e 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
c6e262c4ce Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
a02444825d 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
152156d065 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
d456271921 animal stuns
Fix rebase
2021-01-28 17:22:39 -08:00
661764f4aa Some preliminary balancing
Fix rebase
2021-01-28 17:22:39 -08:00
29732bb763 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
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
1f6cf7e155 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
0cde434e3b All gems make a sound. 2021-01-25 22:53:23 +00:00
157e56d8ca 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
5117edcff9 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
82147653df Merge branch 'torvus-quick-fix' into 'master'
Fix torvus

See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
39d1c9e885 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
77312ccdd4 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
47bd74469b 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
7cbbb70c42 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
43b5559325 Implemented #896 - Added option for Unlimited FPS 2021-01-23 08:34:38 +00:00
fb09d14725 Merge branch 'Rotsuoy/SavannaGrass' into 'master'
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
adaea096d2 Update winit and iced 2021-01-23 01:09:33 -05:00
Sam
5e4b6809ca Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
4014b28d19 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
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
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
8b06d844f7 Golem spinmelee anim 2021-01-21 01:23:10 +01:00
b464a1876e update itertools for voxygen 2021-01-20 16:00:08 +01:00
9f16a946ee update a few deps 2021-01-20 15:53:58 +01:00
1eb7f78189 Revert "Added TR translations for deaths by debuffs."
This reverts commit 0817e45e13.
2021-01-20 11:20:06 +00:00
7dda25a66d More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
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
0b156542e4 roll keyframes
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
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
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
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