7769 Commits

Author SHA1 Message Date
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
2496c05d11 Merge branch 'better-crafting' into 'master'
Crafting station sprites in towns

See merge request veloren/veloren!2160
2021-04-20 15:08:36 +00:00
Joshua Barretto
e8e5cb84a6 Merge branch 'zesterer/small-fixes' into 'master'
Fix block snapping at low TPS, account for FP imprecision in block-hopping

See merge request veloren/veloren!2164
2021-04-20 14:58:40 +00:00
Joshua Barretto
bacabacaaa Made cooking pots glow 2021-04-20 15:39:46 +01:00
Joshua Barretto
66460584e7 Made crafting UI check exact crafting sprite 2021-04-20 15:23:52 +01:00
Joshua Barretto
056fa96a58 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
342ec773d5 Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
e87ee6d8c7 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
9cf21aada5 remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Monty Marz
7de0becc0d clippy 2021-04-20 02:48:17 +02:00
Monty
a0357fdd58 change cauldron spawning
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +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
Joshua Barretto
cf33cc8704 Prevent crafting without station 2021-04-20 02:46:05 +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
Marcel
65c850625f Merge branch 'common-state' into 'master'
Common state

See merge request veloren/veloren!2076
2021-04-20 00:15:48 +00:00
Marcel Märtens
c221209743 only have 1 Fn passed to tick fn 2021-04-20 01:49:45 +02:00
Marcel Märtens
e742020f42 include origin into system name 2021-04-20 01:30:27 +02:00
Marcel Märtens
302769d086 remove authc from common::net 2021-04-20 01:30:23 +02:00
Marcel Märtens
05d0eb9db4 seperate sys/state 2021-04-20 01:30:17 +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
Joshua Barretto
1bfe9f65d6 Fixed block-snapping 2021-04-19 21:46:51 +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
Joshua Barretto
55d21d145f Made twigs/stones slightly more common 2021-04-19 21:33:52 +01:00
Marcel
3fd7aa7327 Merge branch 'james/fix-bow-humanoid-ai' into 'master'
Fix bow AI

See merge request veloren/veloren!2162
2021-04-19 19:52:29 +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
João Capucho
bd76302660
Voxygen: Allow zoom on minimap with kbd 2021-04-19 20:26:54 +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
James Melkonian
519b4127bf Fix bow AI 2021-04-19 12:17:31 -07:00
João Capucho
ae99ed0ade
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
Joshua Barretto
554b9587ed Merge branch 'zesterer/shader-fixes' into 'master'
Fixed water shader, sky shader

See merge request veloren/veloren!2156
2021-04-19 14:29:08 +00:00
Joshua Barretto
81f2c430f2 Fixed water shader, sky shader 2021-04-19 14:42:49 +01:00
Joshua Barretto
1c6b0a4922 Merge branch 'zesterer/small-fixes' into 'master'
Added minimum chunk unload distance to make chunk reload cheesing harder

See merge request veloren/veloren!2157
2021-04-19 11:08:23 +00:00
João Capucho
6cb6b2aa8d
Voxygen: Add support for map zoom with keybind 2021-04-19 11:56:58 +01:00
Joshua Barretto
c8a5e3ac51 Merge branch 'zesterer/econ-tweaks' into 'master'
Limit trading currency to sane amounts

See merge request veloren/veloren!2154
2021-04-19 10:46:17 +00:00
Joshua Barretto
8f25359e9e Added minimum chunk unload distance to make chunk reload cheesing harder 2021-04-19 11:29:20 +01:00
João Capucho
476742d72a
Voxygen: Add inactive window volume 2021-04-19 10:24:31 +01:00
João Capucho
59032b69c9
Voxygen: Update ambient channels volume 2021-04-19 10:24:28 +01:00
João Capucho
9b3de8088a
Voxygen: Use the master volume setting 2021-04-19 10:20:42 +01:00
Joshua Barretto
94e40abab2 Limit trading currency to sane amounts 2021-04-19 10:04:28 +01:00
Samuel Keiffer
12cc4cb29f Merge branch 'capucho/stop-ambient' into 'master'
Stop ambient sounds on logout

See merge request veloren/veloren!2151
2021-04-18 23:38:10 +00:00
Samuel Keiffer
9de4ab4b5e Merge branch 'sam/dash-tweaks' into 'master'
Overhauled dash melee.

See merge request veloren/veloren!2152
2021-04-18 23:12:20 +00: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