Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,950 Commits 151 Branches 18 Tags 2.1 GiB
b85a384d38
Commit Graph

4128 Commits

Author SHA1 Message Date
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
Imbris
2325ac3d78 Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced) 2022-01-30 23:30:34 -05:00
Marcel Märtens
201a5ac2c7 stricten some rules and fix some clippy warnings 2022-01-30 20:16:21 +01:00
Avi Weinstock
f3f08936d8 Decrease too-many-arguments-threshold and type-complexity-threshold. 2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
Imbris
21cad12272 Merge branch 'fix-ghost-item' into 'master' 
Fix ghost item when trade gets declined

Closes #1429

See merge request veloren/veloren!3117
 2022-01-30 17:31:15 +00: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
juliancoffee
fba89517de Move Veloren to 2021 edition 2022-01-26 16:46:40 +02:00
juliancoffee
6a0458ddf1 Move voxygen to 2021 edition 2022-01-26 15:47:39 +02:00
juliancoffee
9edd526279 Move voxygen-i18n to 2021 edition 2022-01-26 15:13:05 +02: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
Martin
a86ed49293 added message and event for deleting a server from the list 2022-01-25 19:48:19 +02:00
Imbris
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
Imbris
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
Imbris
c320604a36 Support multiple texture formats for screenshots 2022-01-25 00:36:08 -05: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
Justin Shipsey
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
jshipsey
067f06561f hold weapon while rolling 2022-01-24 03:55:00 -05:00
Imbris
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
Imbris
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
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
Imbris
7e5a3efd02 Add egui window to toggle experimental shaders. 2022-01-23 21:14:41 -05: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
470353e08c Fix for translucency blocking clouds 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
e6332c1cb5 Significantly improved underwater shaders 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
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
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
Dr. Dystopia
bb48267827 Fix warnings 2022-01-23 19:03:47 +01:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +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
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
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +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
5b606f0d50 Significantly improved underwater shaders 2022-01-21 00:42:20 +00: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