Commit Graph

1923 Commits

Author SHA1 Message Date
Joshua Barretto
6263942041 Merge branch 'slipped/site2' into 'master'
new entities, frostpines

See merge request veloren/veloren!3193
2022-02-10 01:59:20 +00:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
Joshua Barretto
b2d6b06e2e Merge branch 'zesterer/bare-minimum' into 'master'
Added BareMinimum shader effect

See merge request veloren/veloren!3188
2022-02-09 23:29:17 +00:00
Joshua Barretto
e98f9aab63 Slight ambience at night 2022-02-09 22:47:58 +00:00
Joshua Barretto
17d5a9e222 Bare minimum water shaders 2022-02-09 14:41:44 +00:00
Joshua Barretto
0facac68b4 Bad fake lighting in caves 2022-02-09 13:28:07 +00:00
Joshua Barretto
8888190eb4 Added BareMinimum shader effect 2022-02-09 12:56:21 +00:00
phoenix13032005
7a1f0d9fa1 Balance update
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
2022-02-09 12:13:42 +02:00
Youssef Fahmy
4213585058 Fiesta Del Pueblo relocation 2022-02-08 07:51:31 +00:00
Crow
969f744223 added night town song 2022-02-06 18:48:12 -06:00
Zughy
d26906724c New icons in diary general combat section 2022-02-04 20:37:41 +00:00
Imbris
18f6077321 Merge branch 'imbris/srgb-dither' into 'master'
Dither in nonlinear srgb space and dithering related experimental shader options

See merge request veloren/veloren!3160
2022-02-01 21:24:50 +00:00
Justin Shipsey
612f084831 Merge branch 'slipped/bipeds' into 'master'
Slipped/bipeds

See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00:00
Sam
097d6cf07c Extend green 2022-01-30 18:50:18 -05:00
Sam
0c44a7d1ab More tweaking 2022-01-30 18:37:11 -05:00
Sam
bfa9c1ce3a Fixed lifesteal particles 2022-01-30 18:11:41 -05:00
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
Imbris
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
Joshua Barretto
d8c4284a32 Merge branch 'zesterer/worldgen' into 'master'
Improvements to site2

See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
Joshua Barretto
56eff72670 Fixed blue snow 2022-01-27 11:04:05 +00:00
Joshua Barretto
39863e8727 Remove colour banding 2022-01-27 00:29:03 +00:00
Marcel
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
Dominik Broński
ca7b048184 Merge branch 'SeaCrocodile' into 'master'
Sea crocodile

See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
Martin
700f709664 added delete button in the settings window which deletes a server from the list 2022-01-25 19:48:58 +02:00
DaforLynx
361fd72bd1 Added biomes to ron 2022-01-24 12:14:38 -08:00
InfRandomness
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Imbris
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
Joshua Barretto
d18174e0d1 Revert "Merge branch 'infrandomness/remove_alpha' into 'master'"
This reverts merge request !3128
2022-01-24 00:52:03 +00:00
Imbris
6cfadc4f65 Add sobel filter as experimental shader option 2022-01-23 16:32:26 -05:00
Joshua Barretto
abda8058fe Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a3fcd7f568 Unified and fixed attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
b94d560a20 Fixed light extinction 2022-01-23 16:32:26 -05:00
Joshua Barretto
212392a062 Added proper refraction to water surface 2022-01-23 16:32:26 -05:00
Joshua Barretto
470353e08c Fix for translucency blocking clouds 2022-01-23 16:32:26 -05:00
Joshua Barretto
0bcc3fb135 Sprite and figure attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
90f3f0fea0 Stopped caustics appearing in bad places 2022-01-23 16:32:26 -05:00
Joshua Barretto
38832fadd3 Improved underwater lighting on low shader settings 2022-01-23 16:32:26 -05:00
Joshua Barretto
bf214f4de4 Use correct ray direction underwater 2022-01-23 16:32:26 -05:00
Joshua Barretto
5cf5693468 Handle underwater sunlight and moonlight 2022-01-23 16:32:26 -05:00
Joshua Barretto
067e98139f Better caustic movement 2022-01-23 16:32:26 -05:00
Joshua Barretto
c6a9565c0f Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a316a780fc Fixed shader compilation error 2022-01-23 16:32:26 -05:00
Joshua Barretto
e6332c1cb5 Significantly improved underwater shaders 2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
Joshua Barretto
bdb0fc9c16 Merge branch 'zesterer/underwater' into 'master'
Underwater shaders

See merge request veloren/veloren!3127
2022-01-23 20:36:47 +00:00
Joshua Barretto
a49c0f0cdf Fixed caustics 2022-01-23 20:06:44 +00:00
Joshua Barretto
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