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
9,183 Commits 151 Branches 18 Tags 2.1 GiB
zesterer/persistent-world
Commit Graph

3622 Commits

Author SHA1 Message Date
Imbris
1483c2be74 Reset the slot 1 bind group to shadows when dropping the DebugDrawer 2021-06-16 03:24:10 -04:00
Imbris
2d7b82c2f4 Do some checks to make sure WGPU_TRACE_DIR is useable if set and exit early if it isn't to avoid the user not being aware that they are failing to collect a trace 2021-06-16 03:24:10 -04:00
Imbris
19f741b33f Show the graphics backend in the hud debug info and include the adapter info when panicking in the wgpu error handler 2021-06-16 03:24:10 -04:00
Imbris
09a914aa84 Log format used for the swapchain 2021-06-16 03:24:10 -04:00
Imbris
8f429d532a Add note on the reasoning for the visual position interpolation rate value in voxygen 2021-06-16 03:24:10 -04:00
Imbris
345add91db Eliminate panics when .current_monitor() returns None 2021-06-16 01:36:59 -04:00
Imbris
b7162ac15c Upgrade to winit 0.25 2021-06-15 22:59:54 -04:00
Imbris
3e79972061 Merge branch 'capucho/wgpu-format-fixes' into 'master' 
Update wgpu and check for best swap chain format

See merge request veloren/veloren!2454
 2021-06-16 01:24:05 +00:00
Snowram
b82dde2332 Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'" 
This reverts merge request !2457
 2021-06-15 22:12:11 +00:00
Snowram
4d3362586f Double the speed factor of pos interp 2021-06-15 22:11:57 +02:00
Imbris
1ed6a04a34 Merge branch 'zakru/fix/1193' into 'master' 
Avoid saving settings if maps are not updating

Closes #1193

See merge request veloren/veloren!2456
 2021-06-15 19:55:14 +00:00
Imbris
343b35b9cd Merge branch 'rodio014' into 'master' 
bump rodio to 0.14

See merge request veloren/veloren!2443
 2021-06-15 19:04:28 +00:00
Zakru
afc04ae22f Fix settings not saving when zooming map with keys 2021-06-15 21:20:10 +03:00
Zakru
52c965fb6d Avoid saving settings if maps are not updating 
Fixes #1193
 2021-06-15 21:19:52 +03:00
Snowram
84080607cd Truncates consumables value to the first decimal place 2021-06-15 19:36:20 +02:00
juliancoffee
3f176ca068 Panic if can't parse file 2021-06-15 19:15:17 +03:00
Snowram
8fde002189 Merge branch 'snowram/more-trolls' into 'master' 
Add more trolls npcs, and roc npc with tornado attack

See merge request veloren/veloren!2384
 2021-06-15 08:35:30 +00:00
Imbris
a41c7a9a5b Merge branch 'imbris/resize-tweaks' into 'master' 
Resize related tweaks

See merge request veloren/veloren!2448
 2021-06-15 07:53:12 +00:00
Snowram
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
3ba0500b90 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Imbris
f3657903c9 [iced renderer] Skip content processing if the clip intersection is zero sized or invalid 2021-06-15 02:02:10 -04:00
Imbris
cbf0a6baf1 Fix trying to create a zero sized shadow texture when resizing window down to a small size 2021-06-15 01:53:00 -04:00
Samuel Keiffer
fec328a617 Merge branch 'juliancoffee/swing_fix' into 'master' 
Introduce hit_timing for combo_melee

See merge request veloren/veloren!2426
 2021-06-15 02:38:23 +00:00
asumface
8568dfb38e
Bump rodio to 0.14 2021-06-14 22:04:23 +02:00
Avi Weinstock
c5f82b241d Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. 2021-06-14 13:39:50 -04:00
Monty Marz
45f79059d0 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
Avi Weinstock
9d4a65e8ac Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
Marcel Märtens
34f5ff62d4 implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling 2021-06-13 17:42:28 +02:00
juliancoffee
62eaabfe88 Introduce hit_timing for combo_melee 
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
 2021-06-12 14:10:19 +03:00
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Forest Anderson
f578c56db7 Merge branch 'juliancoffee/small_fixes' into 'master' 
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
 2021-06-11 17:46:56 +00:00
Cr0ss0vr
8e0891e3b1 Fix incorrect tooltip on Staff Damage skill - Update diary.rs 2021-06-11 11:59:09 +00:00
juliancoffee
25cbff68d3 remove meaningless variables 2021-06-11 11:44:48 +03:00
juliancoffee
2e5f868f31 Make bow zoom less intense 2021-06-11 01:46:32 +03:00
juliancoffee
edc4af8023 fix Wet debuff image 2021-06-11 01:45:02 +03:00
João Capucho
cc566abe5c
Update wgpu and check for best swap chain format 2021-06-09 21:15:37 +01:00
Marcel
f255f01ac0 Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master' 
Extract 'get_duration_image' function from 'update'

See merge request veloren/veloren!2407
 2021-06-09 14:08:38 +00:00
Dr. Dystopia
cead9a019b Extract 'create_new_text' function from 'update' 2021-06-09 13:35:41 +02:00
Dr. Dystopia
e31cb062a2 Extract 'get_duration_image' function from 'update' 2021-06-09 13:09:31 +02:00
jshipsey
7cb5323eb6 small tweaks 
t
 2021-06-09 01:58:08 -04:00
juliancoffee
df2c3a4950 Fix find_root() search in case if .git isn't dir 2021-06-08 13:34:46 +03:00
Marcel
7e8bebdfa1 Merge branch 'xMAC94x/hashbrown' into 'master' 
switch to hashbrown 0.11 and specs 0.16.2

See merge request veloren/veloren!2390
 2021-06-07 14:31:58 +00:00
Monty
dd0368eed4 3d icon shading 2021-06-07 14:27:49 +02:00
Marcel Märtens
7185dcee68 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
Snowram
279d3ade83 Item tooltip refactor and fixed related to new stats 2021-06-07 11:06:32 +02:00
Sam
0488b2fcd0 Adressed comments on energy and armor functions. 2021-06-07 11:06:25 +02:00
Snowram
76ca99ece4 Derive str from Material, better deserialization 2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
0e269b59d7 tooltip work 2021-06-07 11:01:32 +02:00
jshipsey
5fdb2ac01d migration 2021-06-07 11:01:04 +02:00
Snowram
29a38e6d4f Split tags into material class and material 2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
jshipsey
74fbe9a123 cloth/metallic armor 2021-06-07 10:56:54 +02:00
Imbris
95bfcde6d1 Remove unused velocity field in the Hud and remove unused fields from 
the image slider widget code
 2021-06-07 02:49:35 -04:00
Monty
336d83fc49 new bgs 2021-06-06 19:30:37 +02:00
Marcel
521e1eacf3 Merge branch 'aweinstock/add-models-20210603' into 'master' 
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
 2021-06-06 16:56:21 +00:00
Marcel
45741b0dbd Merge branch 'hqurve/crafting-sorting2' into 'master' 
Widened recipe list in crafting menu and added quality indicators to names in the list

See merge request veloren/veloren!2378
 2021-06-06 15:55:11 +00:00
hqurve
39fc48ac17 Widened recipe list in crafting menu and added quality indicators to names in the list 2021-06-06 15:55:11 +00:00
Jonathan Berglin
38c0e02114 Extract 'create_unlock_skill_button' function from 'update' in diary.rs 2021-06-06 14:14:53 +00:00
Snowram
edfe713076 Cyclops, basilisk, air balloon offsets 2021-06-06 14:12:08 +02:00
Samuel Keiffer
85b8d4e7c0 Merge branch 'sam/yeti' into 'master' 
Yeti Rework

See merge request veloren/veloren!2359
 2021-06-05 23:15:20 +00:00
Snowram
864f230a3c Yeti combat anims 2021-06-06 00:17:23 +02:00
João Capucho
a148d4d01a
Fix scissor panics when window height is 1 2021-06-05 20:36:27 +01:00
Ben Wallis
7b8a398234 Merge branch 'xvar/title-screen-fps-cap' into 'master' 
Added 60 FPS framerate cap for title/menu screens

See merge request veloren/veloren!2377
 2021-06-05 14:00:57 +00:00
Ben Wallis
1a93e3d84f Added 60 FPS framerate cap for title/menu screens 2021-06-05 14:13:53 +01:00
Ben Wallis
e9a5fe1b4d Merge branch 'capucho/wgpu-outdated-swapchain' into 'master' 
Rebuild swapchain on Outdate error

See merge request veloren/veloren!2376
 2021-06-05 10:27:32 +00:00
Sam
93f90d514c Particles for ice spikes 2021-06-04 18:17:15 -05:00
Sam
81f7e690fd Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
a82984b925 Added base ability set 2021-06-04 18:17:14 -05:00
João Capucho
b647cd35f1
Don't draw when window size is minimized 2021-06-04 23:37:33 +01:00
Ben Wallis
059dfd2602 Merge branch 'hqurve/fix-lootscrller' into 'master' 
Fixed loot scroller collisions and cleaned up previous changes

See merge request veloren/veloren!2358
 2021-06-04 20:00:18 +00:00
João Capucho
36c28af46d
Regenerate the swapchain if the frame is outdated 2021-06-04 20:37:39 +01:00
Sam
f066f844b6 Fmt and clippy from toolchain rebase. 2021-06-03 21:39:18 -05:00
jshipsey
ca43a0058a some animation 2021-06-03 21:39:17 -05:00
Sam
35876411cd Fixed tests 2021-06-03 21:39:16 -05:00
Sam
5bf99eac11 Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model. 2021-06-03 21:39:15 -05:00
Sam
c81e1534f7 First 3 abilities for tidal warrior functional. Added bubble particles. 2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. 2021-06-03 19:24:34 -04:00
Yusuf Bera Ertan
05cbaff682
build(nix): add new dependencies to nix build and dev env for wgpu 2021-06-04 00:08:02 +03:00
Imbris
6ffdad173d Switch to using block_on directly from futures-executor instead of the umbrella crate 2021-06-03 14:28:28 -04:00
Imbris
be5ee8e205 Properly calculate the necessary length of the index buffers for checks that ensure they are large enough 2021-06-03 00:45:11 -04:00
Imbris
7fd952e139 Remove stabilized or_patterns feature 2021-06-03 00:10:07 -04:00
Imbris
538677263b Enable since naga currently has issues translating our SPIRV -> metal 2021-06-03 00:10:07 -04:00
Imbris
2b8eaae572 Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code 2021-06-03 00:10:06 -04:00
Imbris
8db11cce37 Use expect to document potential panic when starting a new frame recording, fix clippy warning 2021-06-03 00:10:06 -04:00
Imbris
01aa6af1fd Address various TODOs introduced in wgpu transition 2021-06-03 00:10:06 -04:00
Imbris
8403e4c483 address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace) 2021-06-03 00:10:06 -04:00
Joshua Yanovski
38d2d46165 Fix shadows for wgpu. 
In the process, we also fix our n_e / f_e calculation to actually
compute plane intersections properly.
 2021-06-03 00:10:06 -04:00
Avi Weinstock
a1326d0734 Address MR 2253 review comments. 2021-06-03 00:10:06 -04:00
Avi Weinstock
cf6717ac90 Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it. 2021-06-03 00:10:06 -04:00
Avi Weinstock
7b04599a3b Implement a Debug pipeline for hitboxes and pathfinding lines. 
- Implements mesh generation for cylinders and lines.
    - Implements an Id-allocator so that clients can mutate positions efficiently.
    - Is split into pipeline and scene modules.
    - Contains simple shaders that just pass through a position and color.
 2021-06-03 00:10:06 -04:00
Imbris
99998b9870 Use profling to get spans from wgpu, update wpgu & its deps for various 
fixes
 2021-06-03 00:10:06 -04:00
Imbris
ffdf7012bc Update wgpu to fix dx11 issue 2021-06-03 00:10:06 -04:00
Imbris
2da58029b9 Make models require a non-zero amount of vertices 2021-06-03 00:10:06 -04:00
Imbris
5749983868 Make shadow vert shaders always contain their content but ensure they are never used when shadow maps are disabled, remove uneeded shadow frag shader 2021-06-03 00:10:06 -04:00
Imbris
9ec4fd5b4b Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer 2021-06-03 00:10:06 -04:00
Imbris
81939b4e4e Remove uneeded commented out gfx rendering code 2021-06-03 00:10:06 -04:00
Imbris
1647c9d607 Update wgpu to latest version and improve error formating 2021-06-03 00:10:06 -04:00
Imbris
d5f4a4443a Fix all clippy warnings 2021-06-03 00:10:05 -04:00
Imbris
9be424de53 Remove unused waves texture 2021-06-03 00:10:05 -04:00
Imbris
93ad05d237 Fix most of the cargo check warnings 2021-06-03 00:10:05 -04:00
Imbris
972a6f3605 Replace default wgpu error handler with one that includes the error in the panic message 2021-06-03 00:10:05 -04:00
Imbris
7f9ba17dee Remove unused shadow bind group from the cloud pipeline 2021-06-03 00:10:05 -04:00
Imbris
c381059e28 Require WGPU_TRACE_DIR to be set manually instead of having a default value 2021-06-03 00:10:05 -04:00
Imbris
30f02af6a4 Wait for ingame pipelines to build before entering char select, show pipeline rebuilding status text in the graphics settings tab 2021-06-03 00:10:04 -04:00
Imbris
9c3e3ea638 wgpu rebase fix: crossbeam -> crossbeam_channel 2021-06-03 00:09:55 -04:00
Imbris
f2fed72785 Fix bug in sprite pipeline creation & misc other pipeline creation fixes 2021-06-02 23:59:51 -04:00
Imbris
1830a591f6 Make Drawer work with background pipeline creation 2021-06-02 23:59:51 -04:00
Imbris
c2da81cf18 Move pipeline creation into the background, still needs Drawer modications and UI to display status 2021-06-02 23:59:51 -04:00
Imbris
5b4c60c4ec Fix wrong intermediate target texture format 2021-06-02 23:59:51 -04:00
Imbris
77689d1420 Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase 2021-06-02 23:59:50 -04:00
Imbris
72cb3d0124 Clear textures that will be partially written to work around Dx12 bug on AMD 2021-06-02 23:59:50 -04:00
Imbris
76c7161364 Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue 2021-06-02 23:59:50 -04:00
Imbris
aa2c7721fe Add env vars to set wgpu backend and wgpu api trace save dir (api trace still needs feature to be set ofc) 2021-06-02 23:59:50 -04:00
Imbris
ceaa20c668 Update wgpu 2021-06-02 23:59:50 -04:00
João Capucho
aaa397a52a Fix panic on zero sized scissor 2021-06-02 23:59:50 -04:00
João Capucho
04eff56523 Fix resizing using the wrong value 2021-06-02 23:59:50 -04:00
Imbris
390048263a Allow setting env var to only use the vulkan backend, deactivate profiling if the feature is not available 2021-06-02 23:59:50 -04:00
Imbris
577caa3047 Implement screenshots 2021-06-02 23:59:50 -04:00
Imbris
7723ce265e Update wgpu-profiler, smol rebase fix 2021-06-02 23:59:50 -04:00
Imbris
0e0c8fbfc8 wgpu branch rebase fixes 2021-06-02 23:59:50 -04:00
Imbris
89cb00907a Display gpu timing info in the HUD when enabled 2021-06-02 23:59:50 -04:00
Imbris
64398f6c0a Try out using storage buffer for sprite vertices 2021-06-02 23:59:50 -04:00
Imbris
b9931588e4 Fix bugs with sprite rendering 2021-06-02 23:59:50 -04:00
Imbris
a90373604e Fix sprite vertex lookup, normalize sprite 
normals in vert shader
 2021-06-02 23:59:50 -04:00
Imbris
8d63446300 Almost implement instance merging for sprites (validation error), rebase 
fix
 2021-06-02 23:59:50 -04:00
Imbris
0f1c4080c4 Start sprite refactor 2021-06-02 23:59:49 -04:00
João Capucho
d96f5a07e2 Fix winit returning wrong window size 
It seems like waiting for wgpu to create a instance is enough to make
winit return the correct window size
 2021-06-02 23:59:49 -04:00
João Capucho
e04970addd Fix scissor panic 
Removes the Scale::physical_resolution method as it could become
desynced from the renderer resolution causing the panic
 2021-06-02 23:59:49 -04:00
João Capucho
f5dc871c59 Update to the most recent wgpu 2021-06-02 23:59:49 -04:00
Imbris
a8851b6561 Switch to index rendering for most quad-like things 2021-06-02 23:59:49 -04:00
Imbris
e204a58be2 Small fixes to gpu profiling 2021-06-02 23:59:49 -04:00
Imbris
22d67d4cc1 Update to the latest wgpu git 2021-06-02 23:59:49 -04:00
Imbris
7a67ce87e7 Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes 2021-06-02 23:59:49 -04:00
Imbris
8c21023500 WIP gpu timer thing (not for squashing!) 2021-06-02 23:59:49 -04:00
Imbris
0a60fb2d72 Update wgpu to fix segfault 2021-06-02 23:59:49 -04:00
Imbris
f01d59c1df Fix char select shadows by clearing shadow textures 2021-06-02 23:59:49 -04:00
Imbris
e1af485e5f Add setting for the PresentMode 2021-06-02 23:59:49 -04:00
Imbris
2f69c41b00 fix nametag depth culling as well as a tweak to maybe make the main menu not flicker on intel iGPU 2021-06-02 23:59:49 -04:00
Imbris
261fd24dfd Fix lod alt texture filtering 2021-06-02 23:59:49 -04:00
Imbris
6f6167cd90 Resolve validation errors with trying to use unsupported filtering modes 2021-06-02 23:59:49 -04:00
Joshua Barretto
ae6c5a5c54 Corrected shadow cull mode 2021-06-02 23:59:49 -04:00
Imbris
843529c7bb Update to latest wgpu git (around 0.7), temporarily disable shader validation due to naga bug, rebase fixes!! 2021-06-02 23:59:49 -04:00