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
15,242 Commits 151 Branches 18 Tags 2.1 GiB
e002ed2a84
Commit Graph

15242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
d4e2095d40 Fix character creation error 2024-02-02 20:07:01 -05:00
Sam
26b1561bca Changed to using a separte pseudo container in the database for overflow items 2024-02-02 20:07:01 -05:00
Sam
ccb997cc96 Added check for multiple items being stored with the same overflow position. 2024-02-02 20:07:00 -05:00
Sam
394e798d04 Addressed review comments 2024-02-02 20:07:00 -05:00
Sam
b87d1b649d Overflwo slots now appear as red in the inventory. 2024-02-02 20:06:59 -05:00
Sam
e925664d36 Addressed review comments 2024-02-02 20:06:59 -05:00
Sam
8d1df956d6 Addressed review comments 2024-02-02 20:06:58 -05:00
Sam
632e922db6 Overflow slots displayed in bag 2024-02-02 20:06:58 -05:00
Sam
d01997ca56 Overflow slots as slots 2024-02-02 20:06:55 -05:00
Sam
93ca630a13 Automatically overflows items to 'overflow slots' that are inaccessible if items cannot be inserted in persistence on character load. 2024-02-02 20:06:05 -05:00
Illia Denysenko
2c9ceb51d5 Merge branch 'woeful/shoulder_aiming_camera' into 'master' 
Third person over-the-shoulder camera and look_dir calculations when aiming

See merge request veloren/veloren!4285
 2024-02-02 16:59:13 +00:00
Woeful_Wolf
7b843444be Renamed closest_points_ls3 to closest_points_3d, added comments, disable raycast aiming in FPV, get shortest between entity and terrain raycast 2024-02-02 18:11:37 +02:00
Woeful_Wolf
63394719a1 Make camera offsets and aiming system only apply when wielding ranged 2024-02-01 23:33:05 +02:00
Woeful_Wolf
1c69614b4e Cleanup and comments 2024-02-01 23:32:24 +02:00
Woeful_Wolf
c86f000881 Moved closest_line_seg_line_seg to common/systems/src/phys.rs and renamed to closest_points_ls3 2024-02-01 22:34:42 +02:00
Woeful_Wolf
b9239cf603 Merge branch 'woeful/shoulder_aiming_camera' of https://gitlab.com/veloren/dev/veloren into woeful/shoulder_aiming_camera 2024-02-01 20:38:15 +02:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Woeful_Wolf
f4aa9ecbe3 code-quality edits 2024-02-01 20:36:33 +02:00
Woeful_Wolf
5b00d41cd4 Cleaned up some extra imports and debug code 2024-02-01 20:36:32 +02:00
Woeful_Wolf
1660d703ac Changed how look_dir is calculated when aiming, now ray casts entities and terrain to find target point 2024-02-01 20:36:32 +02:00
Woeful_Wolf
e270992bda Added x and y aiming offsets to settings 2024-02-01 20:36:31 +02:00
Woeful_Wolf
43566bca32 Added x and y camera offsets when aiming in third person 2024-02-01 20:36:30 +02:00
Woeful_Wolf
c78f6c0bc2 Added basic ray_entities and closest_line_seg_line_seg methods 2024-02-01 20:36:29 +02:00
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master' 
Update wgpu

See merge request veloren/veloren!4245
 2024-02-01 12:14:32 +00:00
Marcel Märtens
94df06ca19 remove outdated comment and make use of more constants 2024-02-01 12:17:19 +01:00
Marcel Märtens
dfb8715aed make map_async function slim and handle the other stuff inside the download_and_handle_internal fn which is only called from a seperate thread 2024-02-01 12:05:11 +01:00
Marcel Märtens
db9eca031c use constants in dummy_scene 2024-02-01 12:05:11 +01:00
Isse
95c7e6bd82 list opengl for list-wgpu-backends 2024-02-01 12:05:11 +01:00
Isse
a094495160 add to changelog 2024-02-01 12:05:11 +01:00
Isse
64eda770fb cache max texture size 2024-02-01 12:05:11 +01:00
Isse
2f544868ef various fixes 
- Renames `Drawer::view` to `Drawer::surface_view`.
- Only set present mode if it's supported in `set_render_mode`.
- Don't create view in `Drawer::drop`.
- Format changes.
 2024-02-01 12:05:11 +01:00
Isse
6d45d21d95 remove vulkan validation layer from nix 2024-02-01 12:05:11 +01:00
Isse
a9ea5d31bd remove resolved todo question 2024-02-01 12:05:11 +01:00
Isse
1e40fa55c2 expect on profiler creation error 2024-02-01 12:05:11 +01:00
Isse
3192ed037f remove unnecessary lifetime 2024-02-01 12:05:11 +01:00
Isse
89d70cc932 cache present modes, add check for present modes in set_render_mode and move present mode localization to hud 2024-02-01 12:05:11 +01:00
Isse
cfd0ffd7f6 don't create view in draw_egui 2024-02-01 12:05:11 +01:00
Isse
25c4d65b5d Remove ThirdPassDrawerPrepared, change from Discard to Store 2024-02-01 12:05:11 +01:00
Isse
1d48bfff31 Revert atlas texture name 2024-02-01 12:05:11 +01:00
Isse
ba2e7f6b1d add vk as key for vulkan 2024-02-01 12:05:10 +01:00
Marcel Märtens
856c64c9ee smaller code cleanups, copy paste errors, or wrong merge resolutions fixed according to MR reviews 2024-02-01 12:05:10 +01:00
Isse
02aa740f72 try fix changing settings for opengl + windows 2024-02-01 12:05:10 +01:00
Isse
b7a56e895a Only show available present modes in graphic settings 2024-02-01 12:05:06 +01:00
Isse
82989979a6 try to fix windows build 2024-02-01 12:01:51 +01:00
Isse
00f527fe8b fix gl 2024-02-01 12:01:45 +01:00
Isse
165c88bd74 patch wgpu to 18.2 2024-02-01 12:01:03 +01:00
maxicarlos08
cbcf1965bf Merge branch 'treeco/new-trees-lod' into 'master' 
Added LOD objects for new forest types

See merge request veloren/veloren!4298
 2024-01-31 23:37:58 +00:00
Treeco
7496aa5357 Added LOD objects for new forest types 2024-01-31 23:01:44 +00:00
maxicarlos08
47f583b57b Merge branch 'AutumnForestKind' into 'master' 
Added Autumn ForestKind

See merge request veloren/veloren!4295
 2024-01-31 19:41:16 +00:00
BigKhan
9c57a37a58 fixed comma + changelog 2024-01-31 18:27:38 +00:00