1393 Commits

Author SHA1 Message Date
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
jshipsey
8a82e1aa37 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
heydabop
839f599c49 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
Sam
803c7d81dc Fix a few asset paths for armors. 2021-03-01 00:58:43 -05:00
Samuel Keiffer
c06e36fe6b Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Sam
0ec709bf17 Migration for armor re-organization. 2021-03-01 00:42:35 -05:00
jshipsey
f4a10912b0 more asset organization 2021-02-28 22:18:43 -05:00
Samuel Keiffer
a2c19cd047 Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
7837f480cd Buff icon 2021-02-28 17:31:35 -05:00
Sam
45c739da02 Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00
Imbris
0db3b6a74c Merge branch 'Lerg/Issue_#976' into 'master'
Issue #976 Some inputs are missing the ability to be rebound

See merge request veloren/veloren!1832
2021-02-28 18:23:30 +00:00
Justin Shipsey
2c397f63cc Merge branch 'heydabop/966-controller-y-invert' into 'master'
#966 - Setting to invert controller Y axis

See merge request veloren/veloren!1817
2021-02-28 18:02:04 +00:00
Lerg
56cae542ec Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator 2021-02-28 19:02:32 +03:00
Avi Weinstock
1831efd8e4 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
jshipsey
079f1e7dc0 re-org armor, common 2021-02-27 22:02:05 -05:00