Commit Graph

1398 Commits

Author SHA1 Message Date
Avi Weinstock
d98efb391b Account for model translation in the physics. The voxel collider still needs to be north-aligned for now. 2021-03-11 23:43:55 -05:00
James Melkonian
a70e569396 Allow spawned airships to move 2021-03-11 18:58:57 -08:00
Avi Weinstock
fe4c7a3f6a Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-11 19:01:16 -05:00
Avi Weinstock
6d35e7c6d0 Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct). 2021-03-11 17:27:03 -05:00
Avi Weinstock
1d0600851b Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-11 11:48:59 -05:00
Marcel
ee0ab197da 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
cea895ea24 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel
e29964ead1 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
36d20e6990 Better docs, faster terrain meshing 2021-03-07 14:25:07 +00:00
Joshua Barretto
9910398917 Fixed snow biome trees 2021-03-07 14:25:07 +00:00
Joshua Barretto
0cbdc2b1b7 Better tree names 2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
b6ac4e46fb tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
a54a3da102 Added tree map icon 2021-03-07 14:25:05 +00:00
Joshua Barretto
d4ce69df99 Static light flickering 2021-03-07 14:25:02 +00:00
Joshua Barretto
1d16f14dd5 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
331375fd8f Adjusted static lighting 2021-03-07 14:25:02 +00:00
Joshua Barretto
fe2479ee4c Better LoD water prediction 2021-03-07 14:25:01 +00:00
Monty
8214c9df82 PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
31832e1245 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
aabe1d7cfd Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
100cafa91b Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053 Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
db3bc1b9bb added a white firework 2021-03-07 03:48:50 -05:00
Imbris
575301c763 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
e724ac072e 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
e2d4799f7d 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
6e66cecce7 Split the french translation into multiple files 2021-03-05 12:23:08 +00:00
Sarra
4284ce0411 made firework explosions colorful 2021-03-05 01:22:29 -05:00
Marcel
cb305536e8 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
fb953cc7f4 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Sam
39a580b5ee Added test that all items are properly formatted and valid. Fixed items that were broken. 2021-03-03 16:45:36 -05:00
Sam
ae856edb31 Fixed debug back armor. Removed leather_3 item. 2021-03-03 15:05:51 -05:00
Lippy13
43c35f957f Remove buff information from item description text 2021-03-03 00:25:12 +00:00
Snowram
2b7b9f887b Fixes leather sets 2021-03-02 19:28:29 +01:00
Tadabito
f75f36a2c5 update cloth item tag to fix panic during crafting 2021-03-02 10:31:21 +00:00
Justin Shipsey
9ad8804b60 Merge branch 'armor-org' into 'master'
armor org

See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
jshipsey
308045cfc9 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
heydabop
bfc82f7236 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
Sam
f304fe0f10 Fix a few asset paths for armors. 2021-03-01 00:58:43 -05:00
Samuel Keiffer
0497a437a4 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
7e34f1225f Migration for armor re-organization. 2021-03-01 00:42:35 -05:00
jshipsey
8944115f8e more asset organization 2021-02-28 22:18:43 -05:00
Samuel Keiffer
537efdd47e 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
6ab4e2264e Buff icon 2021-02-28 17:31:35 -05:00
Sam
531c38c3ad Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00