Scott Williams
be311f8ff2
Added gem models for item_manifest
2021-01-24 18:20:10 +00:00
Scott Williams
fda6c9ffd1
Added to changelog.
2021-01-24 16:52:56 +00:00
Scott Williams
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
Scott Williams
32bbdffc38
Added 6 gems, removed shiny gem from cave, replaced with diamond.
2021-01-24 14:00:49 +00:00
Samuel Keiffer
bdbed58b09
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
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
Justin Shipsey
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
Marcel
fba5c65b9e
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
7c7f5517b4
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
3866bc73a4
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
82147653df
Merge branch 'torvus-quick-fix' into 'master'
...
Fix torvus
See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
Monty
7cbf946a65
6 new sceptres, add DPS display to tooltips
2021-01-23 23:10:36 +01:00
Marcel Märtens
3d195348d2
fix ci, which was broken by merging unittests and check
2021-01-23 23:05:24 +01:00
Samuel Keiffer
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
Marcel Märtens
ff10373cbe
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
5eefa86d68
Fix glider stamina drain
2021-01-23 18:20:43 +01:00
Imbris
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
Imbris
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
Lucas Vulpius
43b5559325
Implemented #896 - Added option for Unlimited FPS
2021-01-23 08:34:38 +00:00
Justin Shipsey
fb09d14725
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/savanna grass
See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
Rotsuoy
994677a4d0
Rotsuoy/savanna grass
2021-01-23 07:46:54 +00:00
Imbris
adaea096d2
Update winit and iced
2021-01-23 01:09:33 -05:00
Samuel Keiffer
97f0413307
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
5e4b6809ca
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Sam
d6be67e0a0
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
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
