Marcel
9e47c177d2
Merge branch 'alphyr/assets_manager0_5' into 'master'
...
Update `assets_manager` to 0.5
See merge request veloren/veloren!2501
2021-06-27 15:50:16 +00:00
Nícolas Wildner
a05cebc64e
Update pt br 20210627
2021-06-27 03:26:44 +00:00
juliancoffee
f533e3433c
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
juliancoffee
ffa01621c1
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
71e18ef310
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
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
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
Snowram
a81c71b461
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02: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
Snowram
3b393a9c5c
Ajust new npcs from feedback
2021-06-25 03:26:32 +02: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
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
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
Sam
7406e557e8
3 attacks done
2021-06-23 22:38:16 -05:00
AldanTanneo
b079c832ac
Fixed smooth layer at z=434 (and a few other)
2021-06-23 21:13:15 +02: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
0499a1e360
Added chat toggle
2021-06-21 20:16:03 +01:00
Joshua Barretto
5c09d6f67c
Selectively disable glow flicker for small wins on low-end systems
2021-06-21 17:06:43 +01:00
Justin Shipsey
593dda2043
Merge branch 'donovanlank/Cool_Blue_Lantern' into 'master'
...
made it so Cool Blue Lantern is actually blue
See merge request veloren/veloren!2474
2021-06-21 05:37:49 +00:00
Justin Shipsey
a11284edd3
Update difficulty_distribution.ron
2021-06-20 19:42:21 +00:00
Avi Weinstock
5662ba98b8
Address MR 2482 comments.
...
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
juliancoffee
5491902a1c
Create distribution map for dungeons
...
* tl;dr T0 - 27%, T1/T2 - 22%, T3/T4 - 11%, T5 - 5%.
Before every dungeon had 16% chance to be created.
2021-06-20 00:14:54 +03:00
Avi Weinstock
a831a4fb69
Make lava solid w.r.t. rendering while still being liquid w.r.t. physics.
2021-06-19 16:52:21 -04:00
juliancoffee
9cf83dc6e0
Tip how to make map with dungeons of same level
2021-06-19 23:32:54 +03:00
Avi Weinstock
e09c5adc02
Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode.
2021-06-19 16:31:21 -04:00
juliancoffee
7a03c689f6
Add config file for dungeon distribution
...
- Now you can specify probability of "spawn" of dungeon with specific
difficulty
2021-06-19 23:26:13 +03:00
Samuel Keiffer
0c85a4e7ea
Merge branch 'juliancoffee/clay_golem_tweak' into 'master'
...
clay golem tweak
See merge request veloren/veloren!2478
2021-06-19 14:49:11 +00:00
juliancoffee
0ac97ed156
Nerf golem laser dmg and ori_rate, make it fire
...
+ Make laser state duration lower
2021-06-19 10:47:45 +03:00
Samuel Keiffer
dc9e123ff8
Merge branch 'juliancoffee/quick_trading_balancing' into 'master'
...
trading.ron rebalance
See merge request veloren/veloren!2471
2021-06-19 01:10:18 +00:00
juliancoffee
97167a94d0
Load ori_rate for BasicBeam from assets
...
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
juliancoffee
27e309fb19
Use Golem Shockwave only after loosing 30% health
...
+ Make shockwave buildup longer
2021-06-18 22:32:43 +03:00
Joshua Barretto
493e0c9b2e
Merge branch 'zesterer/meta' into 'master'
...
Optimising for size
See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
Joshua Barretto
bb24068208
Added JPEG backgrounds
2021-06-18 12:28:55 +01:00
Joshua Barretto
38907a8bf2
Added support for JPEG backgrounds
2021-06-18 12:27:39 +01:00
DaforLynx
ae84557cca
More npc sfx
2021-06-18 06:24:57 +00:00
donovanlank
ff403ae7b5
made it so Cool Blue Lantern is actually blue
2021-06-17 18:40:29 -07:00
