Commit Graph

11043 Commits

Author SHA1 Message Date
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
Dr. Dystopia
706a939f39 Revert parameter removal 2022-01-23 16:32:25 -05:00
Dr. Dystopia
9306dc816f Fix warnings 2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
ninefox
04b0277e33 Changed how lantern swap is caught 2022-01-23 13:28:23 -08: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
Forest Anderson
d3aa224f15 Merge branch 'tygyh/Fix-warnings' into 'master'
Fix warnings

See merge request veloren/veloren!3051
2022-01-23 19:25:35 +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
ubruntu
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
Forest Anderson
7c99f6eb5e Merge branch 'unvariant/affix_remap_button' into 'master'
Affixed remap/clear button to top of control settings window

See merge request veloren/veloren!3119
2022-01-23 18:40:43 +00:00
Forest Anderson
1bcda9da7b Merge branch 'maveth/skill-improvements' into 'master'
Test for cyclic skill dependencies

See merge request veloren/veloren!3098
2022-01-23 18:35:58 +00:00
Dr. Dystopia
dd76438299 Revert parameter removal 2022-01-23 19:03:47 +01:00
Dr. Dystopia
bb48267827 Fix warnings 2022-01-23 19:03:47 +01:00
Joshua Barretto
2644c51b39 Merge branch 'infrandomness/remove_alpha' into 'master'
Move alpha values calculation

See merge request veloren/veloren!3128
2022-01-23 17:16:22 +00:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
Joshua Barretto
fb2b9929a6 Unified and fixed attenuation 2022-01-23 16:25:15 +00:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master'
Addressing criticisms

See merge request veloren/veloren!3121
2022-01-22 16:44:01 +00:00
Joshua Barretto
824ba2beff Fixed light extinction 2022-01-21 18:21:14 +00:00
Joshua Barretto
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
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
Joshua Barretto
c0e3f0abef Merge branch 'ubruntu/chest-sprite-names' into 'master'
Fix chest display names

See merge request veloren/veloren!3125
2022-01-21 18:05:39 +00:00
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Joshua Barretto
9a9c32d311 Added proper refraction to water surface 2022-01-21 17:45:50 +00:00
Joshua Barretto
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +00:00
Joshua Barretto
d2d4ca33c9 Sprite and figure attenuation 2022-01-21 14:04:24 +00:00
Joshua Barretto
b3bf06b07d Stopped caustics appearing in bad places 2022-01-21 13:43:36 +00:00
Joshua Barretto
3b347a2aa3 Improved underwater lighting on low shader settings 2022-01-21 13:35:40 +00:00
Samuel Keiffer
a00ac11e25 Merge branch 'sam/fix-possess' into 'master'
Fix possession bug

See merge request veloren/veloren!3123
2022-01-21 07:40:23 +00:00
Joshua Barretto
2263bcbf7c Use correct ray direction underwater 2022-01-21 01:24:00 +00:00
Joshua Barretto
261fdf17a2 Handle underwater sunlight and moonlight 2022-01-21 01:18:43 +00:00
Joshua Barretto
51323cde38 Better caustic movement 2022-01-21 01:06:11 +00:00
Joshua Barretto
63f6af0621 Fixed caustics 2022-01-21 01:03:39 +00:00
Joshua Barretto
c17abb93f1 Fixed shader compilation error 2022-01-21 00:50:14 +00:00
Joshua Barretto
5b606f0d50 Significantly improved underwater shaders 2022-01-21 00:42:20 +00:00
Joshua Barretto
c2644d8e71 Fixed interaction between bloom and point glow 2022-01-20 22:30:05 +00:00
Joshua Barretto
9601462f6c Merge branch 'name_areas_based_on_biome' into 'master'
fix Swamp-naming

See merge request veloren/veloren!3124
2022-01-20 21:17:13 +00:00
floppy
d47e06baac - fix Swamp-naming 2022-01-20 21:46:51 +01:00
Sam
fe1db1e9e0 Can move around, so character state system runs
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
2022-01-20 15:26:35 -05:00
Joshua Barretto
4f181c936d Merge branch 'name_areas_based_on_biome' into 'master'
name_areas_based_on_biome

See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
floppy
8f0ad56d25 change algorithm for biome-naming to weigh chunks evenly 2022-01-20 20:08:59 +01:00
floppy
9f0664c73b civ/mod.rs - replace duplicate code 2022-01-20 16:17:40 +01:00
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00:00
Joshua Barretto
f8783487a8 Preventing gliding when mounted, allowed dancing 2022-01-20 12:53:08 +00:00
Joshua Barretto
89cd58b1ac Don't allow interaction with mounted entity 2022-01-20 11:25:53 +00:00
threadexception
2a65d4950d Fix ghost item when trade gets declined 2022-01-20 09:07:47 +01:00
Justin Shipsey
edb0c87c29 Merge branch 'fix' into 'master'
fix arthropod crash

See merge request veloren/veloren!3120
2022-01-20 07:48:46 +00:00