Commit Graph

11645 Commits

Author SHA1 Message Date
fba89517de Move Veloren to 2021 edition 2022-01-26 16:46:40 +02:00
4fe5fdad4a Move world to 2021 edition 2022-01-26 16:03:27 +02:00
87ea7a906a more biome namegen bricks 2022-01-26 14:58:48 +01:00
e3927ed3f6 Move server to 2021 edition 2022-01-26 15:57:50 +02:00
6a0458ddf1 Move voxygen to 2021 edition 2022-01-26 15:47:39 +02:00
25b04e6ee7 Move common to 2021 edition 2022-01-26 15:17:01 +02:00
9edd526279 Move voxygen-i18n to 2021 edition 2022-01-26 15:13:05 +02:00
ebe95ebe33 Move common-assets to 2021 edition 2022-01-26 15:09:00 +02:00
9d7370ab57 Merge branch 'infrandomness/site2/name_sites' into 'master'
Give names to site2 sites

See merge request veloren/veloren!3145
2022-01-26 11:42:35 +00:00
52c92ba0d4 Give names to site2 sites 2022-01-26 11:42:35 +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
e6ced0577e Persist interface debug checkbox 2022-01-25 22:47:26 -08:00
ca7b048184 Merge branch 'SeaCrocodile' into 'master'
Sea crocodile

See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
ac42b184f5 Merge branch 'sam/possess-fix' into 'master'
Fix possession for animation work purposes.

See merge request veloren/veloren!3142
2022-01-25 18:03:40 +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
a86ed49293 added message and event for deleting a server from the list 2022-01-25 19:48:19 +02:00
Sam
e6bef416b4 Fix possession for animation work purposes. 2022-01-25 12:29:05 -05:00
3bee4ef0d1 Merge branch 'zesterer/worldgen' into 'master'
Fixed site2 economies

See merge request veloren/veloren!3141
2022-01-25 17:02:47 +00:00
59ac3b1d4f Fixed site2 economies 2022-01-25 16:31:12 +00:00
4803891a29 Merge branch 'james/no-cliff-diving-allowed' into 'master'
Prohibit accidental cliff diving by NPCs

See merge request veloren/veloren!3139
2022-01-25 16:25:40 +00:00
2671f824d0 Prohibit accidental cliff diving by NPCs 2022-01-25 16:25:40 +00:00
432d78a232 Merge branch 'imbris/screenshot-format' into 'master'
Support multiple texture formats for screenshots

See merge request veloren/veloren!3134
2022-01-25 14:45:54 +00:00
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