1680 Commits

Author SHA1 Message Date
Samuel Keiffer
06d9ec1d8a Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
Fix campfire heal buff description

See merge request veloren/veloren!2165
2021-04-25 23:06:48 +00:00
Illia Denysenko
8cc6469626 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Joshua Barretto
a785fb13a8 Apply flat earth hack to mist 2021-04-25 23:28:19 +01:00
Joshua Barretto
430d75b67b Capped light access 2021-04-25 22:49:20 +01:00
Joshua Barretto
4626b7e95d More realistic cloud light extinction model 2021-04-25 22:26:07 +01:00
Joshua Barretto
d00348cbd2 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Joshua Barretto
5c469b99d2 Fixed near cloud bug 2021-04-25 20:04:00 +01:00
Monty
c59f11ef6e Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Sam
fdd2b58954 Addressed testing feedback.
Particles better.
2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
alfy
5a759be5e3 Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound 2021-04-25 13:09:06 -04:00
alfy
434d1353eb block and parry sounds added 2021-04-25 13:09:06 -04:00
Sam
165603aa65 Parrying 2021-04-25 13:08:42 -04:00
Sam
c9e1b1d341 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Snowram
58300592ca More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
James Melkonian
7cfd8debed Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
4249d0ddcc Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
738be81943 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
b0d617d91d Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
5b8fbe9a23 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
c7d6dde677 Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
2251c91b1a Merge branch 'xvar/server-version-check' into 'master'
Added client/server version mismatch warnings

See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
d0108fe32b Added client/server version mismatch message when a network error is encountered during client init.
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
holychowders
e7bbe45a42 Fix grammatical error in NPC message 2021-04-23 22:43:37 -07:00
Illia Denysenko
37ed8aa208 update uk_UA localization 2021-04-23 21:30:46 +00:00
Nícolas Wildner
a04768a33e update pt_br 20210422 2021-04-23 01:00:41 +00:00
Monty Marz
ccb913a2c0 Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
d47dc7c49e remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Joshua Barretto
1aed08f885 Made the pit of tartarus less bad 2021-04-21 22:18:44 +01:00
Joshua Barretto
1c225ff449 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Monty
9cf21aada5 remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Joshua Barretto
b511113145 Made sprite/block selection effect more subtle 2021-04-20 02:46:07 +02:00
Joshua Barretto
4710a35c29 Made sprite/block selection effect more subtle 2021-04-20 02:46:06 +02:00
Monty
c40bd37452 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
afea896b5b fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
b605048ae3 Added crafting stations 2021-04-20 02:45:59 +02:00
Joshua Barretto
a3993793a7 Merge branch 'zesterer/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2163
2021-04-19 21:54:26 +00:00
Joshua Barretto
8f23d476e8 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
f6e71f1e87 Fixed negative cloud density bug 2021-04-19 22:02:47 +01:00
Imbris
0f10b75130 Merge branch 'capucho/inactive-master' into 'master'
Lower volume of window on focus loss

See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
Marcel
6f16c1deba Merge branch 'capucho/map-kb-zoom' into 'master'
Add keybindings for map/minimap zoom

See merge request veloren/veloren!2161
2021-04-19 19:52:27 +00:00
João Capucho
06406aee59
Voxygen: Added translations for map zoom 2021-04-19 20:27:02 +01:00
Marcel
6d7c55c726 Merge branch 'juliancoffee/update-uk_UA' into 'master'
Update localization for uk_UA

See merge request veloren/veloren!2155
2021-04-19 19:26:20 +00:00
Illia Denysenko
422a1ba214 Update localization for uk_UA 2021-04-19 19:26:20 +00:00
João Capucho
ae99ed0ade
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
Joshua Barretto
81f2c430f2 Fixed water shader, sky shader 2021-04-19 14:42:49 +01:00
Sam
b0d9a3b4ba Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
2c8f900299 Merge branch 'zesterer/econ-tweaks' into 'master'
Rebalanced economy somewhat

See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00