Snowram
3ec5306ed0
Adds an outcome to death with SFX and VFX
2021-06-29 00:14:05 +02:00
Snowram
b477eac816
Merge branch 'juliancoffee/fix_dismantle' into 'master'
...
Improve Dismantle UX
See merge request veloren/veloren!2498
2021-06-27 00:11:01 +00:00
juliancoffee
681fd37429
style
2021-06-27 02:44:19 +03:00
Ben Wallis
9865b354f9
Merge branch 'xvar/fix-plugin-build-warnings' into 'master'
...
Fixed build warnings for server-cli related to non-default plugin feature
See merge request veloren/veloren!2506
2021-06-26 21:35:54 +00:00
Ben Wallis
a50ed6b50a
Fixed build warnings for server-cli related to non-default plugin feature
2021-06-26 21:56:03 +01:00
Ben Wallis
1186b07fed
Merge branch 'aweinstock/fix-warlord-warlock-migration' into 'master'
...
Rename `remove_warlock_warlord` migration so it actually triggers.
See merge request veloren/veloren!2507
2021-06-26 20:49:28 +00:00
Avi Weinstock
af22f56f9e
Rename remove_warlock_warlord migration so it actually triggers.
2021-06-26 16:28:49 -04:00
juliancoffee
12b5d655cf
Split Material and Dismantle crafting tabs
2021-06-26 21:37:13 +03:00
juliancoffee
12243bd0c0
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
juliancoffee
123b2814cf
Sort tabs in logical sequence
2021-06-26 21:37:13 +03:00
juliancoffee
c93748224b
Clean Material tags
...
- Make ferocious set (currently not lootable) made from Moonweave
- Remove material tag from twig sets
2021-06-26 21:37:13 +03:00
juliancoffee
3d4eb7d6a4
Dismantle Leather items to Thick Leather
...
- Previously both Leather and Rawhide items were dismantled to simple
leather
2021-06-26 21:37:13 +03:00
juliancoffee
3b6d6b9393
Improve Dismantle UX
...
- Change `Any {}` to `Any {} item` so for example when you want to
dismantle something into linen, you will see `Any linen item` which
points you that you need to get some item which is made from linen, and
not some generic linen.
2021-06-26 21:37:13 +03:00
Ben Wallis
d479b6d202
Merge branch 'xvar/default-publish-feature' into 'master'
...
Added default-publish feature and updated build scripts.
See merge request veloren/veloren!2504
2021-06-26 18:04:53 +00:00
Imbris
c214f2f940
Merge branch 'danacus/enumstring' into 'master'
...
Fixing #1169 - use strum macros for BlockKind conversion
Closes #1169
See merge request veloren/veloren!2503
2021-06-26 16:52:26 +00:00
Ben Wallis
da319e71ec
Added default-publish feature and updated build scripts.
2021-06-26 17:48:48 +01:00
Daan Vanoverloop
0076b8379c
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Justin Shipsey
f983295318
Merge branch 'swilliams/jewellery' into 'master'
...
Gem Rings and small change to trading.
See merge request veloren/veloren!2500
2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Joshua Barretto
768e1c0d31
Merge branch 'aweinstock/site2dungeon' into 'master'
...
Convert dungeons to site2.
See merge request veloren/veloren!2499
2021-06-25 23:06:24 +00:00
Avi Weinstock
0ac6305dfc
Rename difficulty to dungeon_difficulty.
2021-06-25 18:18:27 -04:00
Snowram
6e8daefa97
Merge branch 'snowram/new-npcs-batch' into 'master'
...
Snowram/new npcs batch
See merge request veloren/veloren!2495
2021-06-25 20:29:41 +00:00
Avi Weinstock
524dd02f45
Tweaks to dungeon pillars.
2021-06-25 15:54:42 -04:00
Snowram
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
7328b71243
Add comments to dungeon code. Fix the radius calculation (which lead to dungeons getting truncated), and fix sprites spawning above staircases.
2021-06-25 14:08:23 -04:00
Joshua Barretto
b66957bf74
Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master'
...
Fixes a block noise issue at specific layers (z=434 among others)
See merge request veloren/veloren!2494
2021-06-25 12:43:27 +00:00
Avi Weinstock
6af988b806
Fix tests and examples to point to site2 dungeons.
2021-06-24 23:21:49 -04:00
Avi Weinstock
19979413d5
Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings.
2021-06-24 23:03:24 -04:00
Snowram
ef6d6563ea
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Marcel
3e421917e2
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
(uk_UA) small fitting fix
See merge request veloren/veloren!2497
2021-06-24 17:43:23 +00:00
Snowram
d7f25627ab
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
8760b69345
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0
Adds new species
2021-06-24 19:29:44 +02:00
juliancoffee
1eb9c165be
(uk_UA) small fitting fix
2021-06-24 19:52:38 +03:00
Samuel Keiffer
e3bf77298b
Merge branch 'sam/harvester' into 'master'
...
Harvester
See merge request veloren/veloren!2413
2021-06-24 04:15:56 +00:00
Sam
645cc60dc0
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
68c6a0a495
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
aac24ad601
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Snowram
47cc040301
Adds SpriteSummon animation
2021-06-23 22:38:16 -05:00
Sam
c162827f97
Harvester AI
2021-06-23 22:38:16 -05:00
Sam
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
033dbbf02a
Add pillars and wall sconces to site2 dungeons.
2021-06-23 23:22:14 -04:00
Avi Weinstock
c68d79315e
Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms.
2021-06-23 23:22:14 -04:00
