Samuel Keiffer
17f358681b
Merge branch 'lboklin/glider-stamina' into 'master'
...
Fix glider stamina drain
See merge request veloren/veloren!1718
2021-01-23 23:21:22 +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
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
Ludvig Böklin
de1fcf8938
Fix glider stamina drain
2021-01-23 18:20:43 +01: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
Samuel Keiffer
957eb91397
Merge branch 'sam/fix-dash' into 'master'
...
Dash now ticks damage based off distance rather than duration.
See merge request veloren/veloren!1715
2021-01-23 04:42:56 +00:00
Sam
2a6f1236d4
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Sam
3a36408461
Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee.
2021-01-22 18:10:47 -05:00
Samuel Keiffer
4ce6e079ad
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
020e4acba4
Removed body from stats component as there is already a body component.
2021-01-22 16:50:22 -05:00
Joshua Barretto
000f3fdbbb
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
32eca9b0a5
Swilliams/golem hitbox fix
2021-01-22 16:30:35 +00: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
Samuel Keiffer
1a7b438dc1
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
9b2a517d79
Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions.
2021-01-21 14:56:24 -05:00
Snowram
43a8d2c06a
Golem spinmelee anim
2021-01-21 01:23:10 +01:00
Sam
83b2c588d9
Changed how it moved golem.
2021-01-20 17:22:24 -05:00
Acrimon
3edca7e8c2
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
db59547de9
Golems are now lactose tolerant.
2021-01-20 11:54:57 -05: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
39be359d9f
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
3b01a888da
Revert "Added TR translations for deaths by debuffs."
...
This reverts commit 0817e45e131b70dbd7ef8bee768ccc377301b5d7.
2021-01-20 11:20:06 +00:00
Justin Shipsey
49cc3f3fa7
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
18b981bd45
More footstep sfx based on distance
2021-01-19 19:51:19 -08:00
Snowram
95ee8a3f50
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
cc0993d6e7
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
51425115d4
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
4fe8305907
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
ab1e13a0a6
small sfx fix, adding consume sfx for salads and lettuce
2021-01-19 16:24:44 -05:00
Acrimon
4cf58fb6d5
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
1453e964a6
Players should no longer reward exp on being killed.
2021-01-19 15:27:56 -05:00
Ben Wallis
1801548824
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
6ac42b3a61
Make only humanoid agents attempt to roll
2021-01-19 10:42:46 -08:00
Acrimon
f3784e5545
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
f332bf4ceb
Sarrakitty/rotsys item sprites
2021-01-19 18:23:44 +00:00
Acrimon
fd22d0004e
build tip
2021-01-19 19:02:41 +01:00
Samuel Keiffer
f96489b66a
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
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
