1407 Commits

Author SHA1 Message Date
Samuel Keiffer
5e5ec967d1 Merge branch 'sam/sceptre-overhaul' into 'master'
Overhaul sceptre

Closes #768

See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
omm
22eb7438e0 File structure for lang es_ES aligned with EN 2021-03-11 12:08:37 +00:00
Sam
472a665826 Auras will now refresh buffs if a buff was already present that had a lesser duration.
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
2021-03-09 18:03:06 -05:00
Sam
0f1f8c89f5 Sceptre skill tree and migration. 2021-03-09 18:02:07 -05:00
Sam
22f81e4df3 Aura duration separated from cast duration in aura state
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
2021-03-09 18:02:00 -05:00
Sam
be2f8ac6b8 Aura particles. 2021-03-09 17:59:45 -05:00
Monty Marz
2bd4cbd3e3 cleanup, icons 2021-03-09 17:59:45 -05:00
Sam
8586121cfc Beam particle tweaks 2021-03-09 17:59:43 -05:00
Monty
ba534f1548 adjusted combo counter anim 2021-03-09 17:59:43 -05:00
Sam
1a2824344b Changed lifesteal beam particles to look better.
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
2021-03-09 17:59:41 -05:00
Sam
2293a2a064 Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05:00
Sam
5772757f7a Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal. 2021-03-09 17:59:33 -05:00
Sam
3ee05be147 Added healing beam character state.
This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-09 17:58:20 -05:00
Sam
f23c5db806 New abilities for sceptre are done 2021-03-09 17:56:38 -05:00
Marcel
86e663c4e7 Merge branch 'updated_spanish_es_strings' into 'master'
Updated strings Added missing translations in Spanish es_ES and retrieving localized text

See merge request veloren/veloren!1866
2021-03-09 12:59:03 +00:00
tukilo
0b54cc5b78 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Avi Weinstock
e9357e1dd6 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Adam Blanchet
5884530486 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel
a7562e975e Merge branch 'sarrakitty/fireworks' into 'master'
added a white firework

See merge request veloren/veloren!1856
2021-03-07 18:37:35 +00:00
Joshua Barretto
7b0b410b4f Better docs, faster terrain meshing 2021-03-07 14:25:07 +00:00
Joshua Barretto
34f98e7d4b Fixed snow biome trees 2021-03-07 14:25:07 +00:00
Joshua Barretto
4b2c7c9dbc Better tree names 2021-03-07 14:25:07 +00:00
Joshua Barretto
71fdf0e333 Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
465bb9cb0f tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
67f085d948 Added tree map icon 2021-03-07 14:25:05 +00:00
Joshua Barretto
5e6906a3df Static light flickering 2021-03-07 14:25:02 +00:00
Joshua Barretto
46f1eadf10 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
98bf7c49fd Adjusted static lighting 2021-03-07 14:25:02 +00:00
Joshua Barretto
8106957933 Better LoD water prediction 2021-03-07 14:25:01 +00:00
Monty
80454d005a PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
bbcf881349 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
43f5e86884 Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
e01f33a121 Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
8b752412d6 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
4be9a7274b Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
54bb6484e8 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
7df4371ccd added a white firework 2021-03-07 03:48:50 -05:00
Imbris
f48a522e07 Merge branch 'Quibble/item-buff-tooltips' into 'master'
Tooltips use item stats for buff information

See merge request veloren/veloren!1820
2021-03-05 22:00:24 +00:00
Imbris
e583afbdaf Merge branch 'sarrakitty/fireworks' into 'master'
made firework explosions colorful

See merge request veloren/veloren!1851
2021-03-05 17:48:56 +00:00
Snowram
d243f12b20 Merge branch 'vfoulon80/convert-fr-translations' into 'master'
Split the french translation into multiple files

See merge request veloren/veloren!1672
2021-03-05 12:23:08 +00:00
Vincent Foulon
503f44f0c2 Split the french translation into multiple files 2021-03-05 12:23:08 +00:00
Sarra
df78d4654a made firework explosions colorful 2021-03-05 01:22:29 -05:00
Marcel
a7ecd8e180 Merge branch 'vfoulon80/skilltree-icons' into 'master'
implement the new skilltree icons

See merge request veloren/veloren!1794
2021-03-04 18:37:33 +00:00
Vincent Foulon
4b23a3b307 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Sam
7e8556406d Added test that all items are properly formatted and valid. Fixed items that were broken. 2021-03-03 16:45:36 -05:00
Sam
eaa240fdc0 Fixed debug back armor. Removed leather_3 item. 2021-03-03 15:05:51 -05:00
Lippy13
119c3bf3fe Remove buff information from item description text 2021-03-03 00:25:12 +00:00
Snowram
fdf9fcc06f Fixes leather sets 2021-03-02 19:28:29 +01:00
Tadabito
d97a65d3af update cloth item tag to fix panic during crafting 2021-03-02 10:31:21 +00:00
Justin Shipsey
c9e8302cda Merge branch 'armor-org' into 'master'
armor org

See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00