Samuel Keiffer
a6271e94f7
Merge branch 'sam/speed-beam' into 'master'
...
Fixed how the speed stat was applied to beams.
See merge request veloren/veloren!1732
2021-01-24 23:23:53 +00:00
Samuel Keiffer
7b49d3f5fa
Merge branch 'sam/skill-balancing-2' into 'master'
...
Bow nerf with skills
See merge request veloren/veloren!1731
2021-01-24 21:17:45 +00:00
Sam
46d00e3d5e
Fixed how the speed stat was applied to beams.
2021-01-24 16:01:38 -05:00
Sam
15f0ce1173
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
Samuel Keiffer
a9c79d1798
Merge branch 'sam/mindflayer-rebalance' into 'master'
...
Rebalanced mindflayer.
See merge request veloren/veloren!1728
2021-01-24 18:03:02 +00:00
Joshua Barretto
2a69813cf8
Merge branch 'synis/fix-cave-rng' into 'master'
...
Fixes #935 - deterministic sprite placement in caves
Closes #935
See merge request veloren/veloren!1721
2021-01-24 17:17:02 +00:00
Sam
000105d950
Rebalanced mindflayer.
2021-01-24 10:56:12 -05:00
Samuel Keiffer
fe536dda2f
Merge branch 'swilliams/hitbox-adjustments' into 'master'
...
General NPC Hitbox Adjustments
See merge request veloren/veloren!1723
2021-01-24 04:00:57 +00:00
Scott Williams
c7700f4caf
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +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
1a9b60d036
Merge branch 'xMAC94x/fix_ci' into 'master'
...
fix ci, which was broken by merging unittests and check
See merge request veloren/veloren!1722
2021-01-24 02:29:28 +00:00
Marcel
ca55c63a40
Merge branch 'xMAC94x/3rd_party_consistenvy_unittests' into 'master'
...
add unittests for api compatibility for client::Client and common::Clock
See merge request veloren/veloren!1719
2021-01-24 00:11:34 +00:00
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
Monty
b853fecf61
6 new sceptres, add DPS display to tooltips
2021-01-23 23:10:36 +01:00
Marcel Märtens
9092e65c2c
fix ci, which was broken by merging unittests and check
2021-01-23 23:05:24 +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
dryadee
e4ff0c75a5
Fixes #935 - deterministic sprite placement in caves
2021-01-23 21:14:07 +01:00
Marcel Märtens
515e86fe02
add unittests for api compatibility for client::Client and common::Clock
...
this tests the broad api of veloren and FAILS in case the interface is changed. It contains a not that those functions are commonly used by 3rd parties
and thus they need to be notified
2021-01-23 21:06:47 +01: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
