Daan Vanoverloop
7d39c14481
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Benoît du Garreau
ab3c8cf764
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
Justin Shipsey
dbc3243691
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
14f16a3a47
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Joshua Barretto
9c746f7867
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
7b2adc0e22
Rename difficulty to dungeon_difficulty.
2021-06-25 18:18:27 -04:00
Snowram
593f12c861
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
98a1034167
Tweaks to dungeon pillars.
2021-06-25 15:54:42 -04:00
Snowram
a81c71b461
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
2221825533
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
0b571af2a5
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
97d0be5a15
Fix tests and examples to point to site2 dungeons.
2021-06-24 23:21:49 -04:00
Avi Weinstock
f74506038d
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
3b393a9c5c
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Marcel
6f0e40d907
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
f518aebe81
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
080328941b
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
21b526856d
Adds new species
2021-06-24 19:29:44 +02:00
juliancoffee
6016d19602
(uk_UA) small fitting fix
2021-06-24 19:52:38 +03:00
Imbris
4c881e411d
Ensure bind groups are ordered with the most frequently changed ones in later slots
2021-06-24 00:47:59 -04:00
Samuel Keiffer
36b0e326f5
Merge branch 'sam/harvester' into 'master'
...
Harvester
See merge request veloren/veloren!2413
2021-06-24 04:15:56 +00:00
Sam
cd1ede0131
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
4d5ab5c374
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
e93c981ed5
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
5dc1f8f8ae
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Snowram
718eafd13b
Adds SpriteSummon animation
2021-06-23 22:38:16 -05:00
Sam
d46aa358c8
Harvester AI
2021-06-23 22:38:16 -05:00
Sam
d93d0aa4f5
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
c326df0b88
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
129b6cb30c
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
7406e557e8
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
ce67498083
Add pillars and wall sconces to site2 dungeons.
2021-06-23 23:22:14 -04:00
Avi Weinstock
3981099f30
Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms.
2021-06-23 23:22:14 -04:00
Avi Weinstock
9b7181e5ab
Traverse the dungeon tile structure to create the rooms, and align the stairs.
2021-06-23 23:22:14 -04:00
Avi Weinstock
fc2d0225d3
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
Avi Weinstock
1da3f8a83b
Get structures loading via sampling primitive.
2021-06-23 23:22:14 -04:00
Avi Weinstock
382a783d40
Progress on converting dungeons to site2. Adds Sampling and Translate primitives.
2021-06-23 23:22:14 -04:00
Samuel Keiffer
2fb13cb865
Merge branch 'juliancoffee/slow_food' into 'master'
...
Balance food to have sane health per second regen
See merge request veloren/veloren!2490
2021-06-24 01:45:10 +00:00
AldanTanneo
b079c832ac
Fixed smooth layer at z=434 (and a few other)
2021-06-23 21:13:15 +02:00
Marcel
86e3483590
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): update audio resource patch
See merge request veloren/veloren!2493
2021-06-23 06:46:02 +00:00
Yusuf Bera Ertan
057c757384
build(nix): update audio resource patch
2021-06-23 08:52:04 +03:00
Justin Shipsey
48ab68b02c
Merge branch 'slipped/movetweak' into 'master'
...
strafe side speed tweak
See merge request veloren/veloren!2492
2021-06-23 02:48:38 +00:00
jshipsey
50df5a7fca
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
juliancoffee
3954ded27b
changelog
2021-06-22 20:52:44 +03:00
juliancoffee
0cb436bfd0
Balance food to have sane health per second regen
...
* Gatherable food gives you slightly variable regen with variable time
based on tier and that fact that we have x2 health on endgame character.
For example while mushroom gives you 5 health over 10 seconds (0.5 health-per-second),
mushroom curry will give you 120 health over 80 seconds (1.5 health-per-second).
* Meat gives you twice powerful regen strength, but with twice shorter
duration
2021-06-22 20:51:31 +03:00
Dominik Broński
1d55cb9c15
Merge branch 'aweinstock/lava' into 'master'
...
Lava
See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
42daef59e4
Merge branch 'zesterer/small-fixes' into 'master'
...
Small improvements
See merge request veloren/veloren!2488
2021-06-21 20:49:41 +00:00
