|
f9ce85164f
|
Merge branch 'imbris/fix-egui-mouse-capture' into 'master'
Fix egui capturing mouse when hidden.
See merge request veloren/veloren!3140
|
2022-01-25 14:41:50 +00:00 |
|
|
ea6f09ec88
|
change SeaCrocodile spawn
|
2022-01-25 10:27:25 +01:00 |
|
|
2bada7f02a
|
Don't send egui events when it is hidden and as a result these events are also never captured by egui. This fixes issues with the mouse clicks being captured if the mouse was hovered over the egui UI when it was toggled off.
|
2022-01-25 01:23:46 -05:00 |
|
|
c320604a36
|
Support multiple texture formats for screenshots
|
2022-01-25 00:36:08 -05:00 |
|
|
54d5a06a0d
|
Merge branch 'unvariant/lantern_bug' into 'master'
Fixes #1406 - Lantern light does not change when dragging it from inventory
Closes #1406
See merge request veloren/veloren!3107
|
2022-01-25 02:59:29 +00:00 |
|
|
ae7859269d
|
Merge branch 'DaforLynx/new-biomes-music' into 'master'
Add "new" biomes to soundtrack listing
See merge request veloren/veloren!3138
|
2022-01-24 21:01:11 +00:00 |
|
|
361fd72bd1
|
Added biomes to ron
|
2022-01-24 12:14:38 -08:00 |
|
|
ff36a96ea5
|
Merge branch 'infrandomness/remove_alpha' into 'master'
Move alpha values calculation to CPU
See merge request veloren/veloren!3137
|
2022-01-24 19:24:51 +00: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 |
|
|
05d5bca72d
|
Merge branch 'slipped/roll' into 'master'
hold weapon while rolling
See merge request veloren/veloren!3135
|
2022-01-24 09:56:00 +00:00 |
|
|
067f06561f
|
hold weapon while rolling
|
2022-01-24 03:55:00 -05:00 |
|
|
537495dd24
|
Merge branch 'imbris/egui-toggle-simplify' into 'master'
Only toggle egui via F7 instead of needing to also have debug toggle on with F3
See merge request veloren/veloren!3133
|
2022-01-24 08:15:36 +00:00 |
|
|
57781eac27
|
Only toggle egui via F7 instead of needing to also have debug toggle on with F3
|
2022-01-24 01:40:55 -05:00 |
|
|
086b4bece8
|
Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master'
Kalikatz/tweak to chat scroll issue
See merge request veloren/veloren!2962
|
2022-01-24 06:14:08 +00: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 |
|
|
7e5a3efd02
|
Add egui window to toggle experimental shaders.
|
2022-01-23 21:14:41 -05:00 |
|
|
d83a1039eb
|
Merge branch 'revert-2644c51b' into 'master'
Revert "Merge branch 'infrandomness/remove_alpha' into 'master'"
See merge request veloren/veloren!3132
|
2022-01-24 01:19:24 +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 |
|
|
706a939f39
|
Revert parameter removal
|
2022-01-23 16:32:25 -05:00 |
|
|
9306dc816f
|
Fix warnings
|
2022-01-23 16:32:25 -05:00 |
|
|
57d9283afb
|
Show HUD for campfires
|
2022-01-23 16:32:25 -05:00 |
|
|
04b0277e33
|
Changed how lantern swap is caught
|
2022-01-23 13:28:23 -08: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 |
|
|
d3aa224f15
|
Merge branch 'tygyh/Fix-warnings' into 'master'
Fix warnings
See merge request veloren/veloren!3051
|
2022-01-23 19:25:35 +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 |
|
|
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 |
|
|
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 |
|
|
dd76438299
|
Revert parameter removal
|
2022-01-23 19:03:47 +01:00 |
|
|
bb48267827
|
Fix warnings
|
2022-01-23 19:03:47 +01:00 |
|
|
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 |
|
|
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 |
|