Commit Graph

2708 Commits

Author SHA1 Message Date
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
89edd18787 Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options 2022-01-28 22:55:59 -05:00
d8c4284a32 Merge branch 'zesterer/worldgen' into 'master'
Improvements to site2

See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
9a2fde557c Fix rebase 2022-01-28 00:02:34 +02:00
5a370cb6f7 Loadout Update: Use
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
2022-01-28 00:02:34 +02:00
7585c8dcc1 Migrate EntityConfig for Loadout update 2022-01-28 00:02:34 +02:00
56eff72670 Fixed blue snow 2022-01-27 11:04:05 +00:00
2fe8cb965d change SeaCrocodile spawn 2022-01-27 11:34:59 +01:00
39863e8727 Remove colour banding 2022-01-27 00:29:03 +00:00
0ebff57a59 Merge branch 'Martin/remove-server-from-list' into 'master'
Feature: Delete button in the servers menu

See merge request veloren/veloren!3144
2022-01-26 10:20:15 +00:00
ca7b048184 Merge branch 'SeaCrocodile' into 'master'
Sea crocodile

See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
700f709664 added delete button in the settings window which deletes a server from the list 2022-01-25 19:48:58 +02:00
ea6f09ec88 change SeaCrocodile spawn 2022-01-25 10:27:25 +01:00
361fd72bd1 Added biomes to ron 2022-01-24 12:14:38 -08:00
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
fc3da4bfce Merge branch 'imbris/sobel' into 'master'
Add experimental sobel filter

See merge request veloren/veloren!3113
2022-01-24 02:42:54 +00:00
d18174e0d1 Revert "Merge branch 'infrandomness/remove_alpha' into 'master'"
This reverts merge request !3128
2022-01-24 00:52:03 +00:00
6cfadc4f65 Add sobel filter as experimental shader option 2022-01-23 16:32:26 -05:00
abda8058fe Fixed caustics 2022-01-23 16:32:26 -05:00
a3fcd7f568 Unified and fixed attenuation 2022-01-23 16:32:26 -05:00
b94d560a20 Fixed light extinction 2022-01-23 16:32:26 -05:00
212392a062 Added proper refraction to water surface 2022-01-23 16:32:26 -05:00
470353e08c Fix for translucency blocking clouds 2022-01-23 16:32:26 -05:00
0bcc3fb135 Sprite and figure attenuation 2022-01-23 16:32:26 -05:00
90f3f0fea0 Stopped caustics appearing in bad places 2022-01-23 16:32:26 -05:00
38832fadd3 Improved underwater lighting on low shader settings 2022-01-23 16:32:26 -05:00
bf214f4de4 Use correct ray direction underwater 2022-01-23 16:32:26 -05:00
5cf5693468 Handle underwater sunlight and moonlight 2022-01-23 16:32:26 -05:00
067e98139f Better caustic movement 2022-01-23 16:32:26 -05:00
c6a9565c0f Fixed caustics 2022-01-23 16:32:26 -05:00
a316a780fc Fixed shader compilation error 2022-01-23 16:32:26 -05:00
e6332c1cb5 Significantly improved underwater shaders 2022-01-23 16:32:25 -05:00
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
bdb0fc9c16 Merge branch 'zesterer/underwater' into 'master'
Underwater shaders

See merge request veloren/veloren!3127
2022-01-23 20:36:47 +00:00
a49c0f0cdf Fixed caustics 2022-01-23 20:06:44 +00:00
8504a8ab21 Merge branch 'ubruntu/campfire-hud' into 'master'
Show HUD for campfires

See merge request veloren/veloren!3097
2022-01-23 19:25:11 +00:00
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
fb2b9929a6 Unified and fixed attenuation 2022-01-23 16:25:15 +00:00
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master'
Addressing criticisms

See merge request veloren/veloren!3121
2022-01-22 16:44:01 +00:00
824ba2beff Fixed light extinction 2022-01-21 18:21:14 +00:00
b8df17080d Merge branch 'infrandomness/waypoint_binding_customization' into 'master'
Add waypoint binding customization code

See merge request veloren/veloren!3122
2022-01-21 18:05:41 +00:00
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
9a9c32d311 Added proper refraction to water surface 2022-01-21 17:45:50 +00:00
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +00:00
d2d4ca33c9 Sprite and figure attenuation 2022-01-21 14:04:24 +00:00