1529 Commits

Author SHA1 Message Date
Vincent Foulon
ce5970c8c1 address review comments 2021-04-01 19:13:08 +02:00
Vincent Foulon
b6ea31446f Add dialogue when the Merchant is busy and randomize some trading dialogues 2021-03-31 19:06:41 +02:00
Snowram
f5bd61a683 Merge branch 'snowram/new-weapons-fix' into 'master'
Fix a staff icon, some offset fixes, lower wolf spawn rate

See merge request veloren/veloren!2025
2021-03-30 01:04:37 +00:00
Joshua Barretto
5cc6061606 Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements

See merge request veloren/veloren!2032
2021-03-30 00:16:45 +00:00
Snowram
95924315fb Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Samuel Keiffer
c978386d40 Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Joshua Barretto
8ecc0d5231 Improved hit particles 2021-03-29 21:52:05 +01:00
Joshua Barretto
6f72e53295 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
843f295eef Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
58b5e5fcee Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
2fe2d91ab0 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Snowram
6451caf15b Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
71fabb1637 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Sam
d17edfcd64 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Sam
f2f2c41f86 Fix emerald sceptre. Remove duplicate asset. 2021-03-28 21:19:01 -04:00
Snowram
a1067a2ddb Merge branch 'snowram/new-scepters-starves' into 'master'
Add new batch of starves and scepter (by Gemu)

See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
4b95401f7c Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Joshua Barretto
64c517b7b2 Revert to old sky colours for no clouds 2021-03-28 17:07:41 +01:00
Joshua Barretto
6f7c2fbc04 Toned down aurora 2021-03-28 17:07:41 +01:00
Treeco
2922b00c11 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Joshua Barretto
14257bd82d Made clouds adjust to world dimensions correctly 2021-03-28 17:02:17 +01:00
Joshua Barretto
fa1fee430b Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Joshua Barretto
48c733b77a Properly simulate atmospheric scattering 2021-03-28 17:01:53 +01:00
Joshua Barretto
2874cc54e1 Client-side time of day interpolation 2021-03-28 17:01:53 +01:00
Joshua Barretto
a76f15dd9f Softer and faster clouds with more verticality 2021-03-28 17:01:51 +01:00
Scott Williams
998d5f0719 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Sam
8c91749cf8 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Monty
8d0b1e201a decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
jshipsey
094fb4ee95 flayer anims 2021-03-27 21:05:16 -04:00
Sam
20989428d3 Balance tweaks 2021-03-27 21:05:15 -04:00
Monty Marz
25f4f15c37 decayed health texture 2021-03-27 21:05:14 -04:00
Monty Marz
ee0214317f WIP animation 2021-03-27 21:05:13 -04:00
Sam
43290d1dc3 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
c315278673 Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
4358908fda Mindflayer can now lifesteal off of its own minions 2021-03-27 21:05:11 -04:00
Sam
c1db5e230b Mindflayer summons husks instead of dogs now 2021-03-27 21:05:10 -04:00
Snowram
5b83b912f3 Adds husk npc 2021-03-27 21:05:09 -04:00
Sam
7e7a6001dc Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
02de4631c1 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
17eab079ee Gave mindflayer AI.
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
5ebd2cf1d0 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
90e33cafb5 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Sam
c2e66c949c Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
3452857d5c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Marcel
54e29cc2e1 Merge branch 'swilliams/character-randomization-fix' into 'master'
Character Creation Randomization Fix

See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
e0e7ab8fa2 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
Avi Weinstock
6c5697915f Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
Marcel
757692edb6 Merge branch 'refactor-login' into 'master'
refactor handling of duplicate login #1015

Closes #1015

See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
Sam
7a3a5330dd Fixed boost having ridiculous velocity. 2021-03-26 16:11:25 -04:00
Scott Williams
fd501b68df Moved rugged armour to cloth_item 2021-03-26 16:51:43 +00:00