Commit Graph

5446 Commits

Author SHA1 Message Date
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
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
165c88bd74 patch wgpu to 18.2 2024-02-01 12:01:03 +01:00
Isse
9903d2c545 more testing 2024-01-30 00:52:49 +01:00
João Capucho
d29d22dd0a update to wgpu 0.18 2024-01-30 00:52:49 +01:00
Isse
5e987efe99 Merge branch 'isse/list-backends' into 'master'
Voxygen list backends subcommand

See merge request veloren/veloren!4288
2024-01-29 17:48:55 +00:00
Imbris
e3b0044186 Add period to comment 2024-01-29 17:02:10 +00:00
Marcel Märtens
272837d4e5 add documentation for list-wgpu-backends 2024-01-29 17:23:45 +01:00
Christof Petig
eaba303670 Merge branch 'christof/hot-reload-fix' into 'master'
Fix hot reloading for plugin combined manifests

See merge request veloren/veloren!4280
2024-01-28 20:02:02 +00:00
Isse
b523423404 Voxygen list backends subcommand 2024-01-28 18:44:18 +01:00
maxicarlos08
d11c58b75b Merge branch 'synis/item-tabcomplete' into 'master'
Incremental item path autocomplete

See merge request veloren/veloren!4281
2024-01-27 18:03:21 +00:00
Isse
2023786f5e Merge branch 'isse/optimize-weather' into 'master'
Optimize weather

See merge request veloren/veloren!4270
2024-01-27 17:20:53 +00:00
Syniis
04acb82d75 Fix asset prefix not working with sudo 2024-01-27 17:34:25 +01:00
Syniis
488922ac94 Cleaner code 2024-01-27 16:16:30 +01:00
Syniis
b97e27df9a Allow specifiying prefix for AssetPath command argument 2024-01-27 15:44:03 +01:00
Syniis
d46dbb9708 Incremental item path autocomplete 2024-01-27 13:41:39 +01:00
Christof Petig
cc93474c2f fix hot reloading of combined manifests 2024-01-27 12:40:34 +01:00
Tim Vincent
2ac2f2d45e stops centering the cursor to prevent camera jumping when the cursor grab is released 2024-01-23 20:09:23 -08:00
Isse
497cb13e50 always use players weather, and fix weather fr this time 2024-01-23 23:18:14 +01:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 2024-01-21 21:30:08 +00:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Joshua Barretto
e231b8f9c1 Apply watcher properties more sensibly 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
Samuel Keiffer
9998dbd587 Merge branch 'sam/expose-charms' into 'master'
Charms now have crafting recipes.

See merge request veloren/veloren!4179
2024-01-21 17:39:37 +00:00
Isse
0755f339a2 Merge branch 'woeful/1923-wrong-digging-tooltip' into 'master'
Fixes #1923 - Pickaxe tooltip wrong for digging

Closes #1923

See merge request veloren/veloren!4263
2024-01-21 14:21:46 +00:00
Maxicarlos08
0b1f8dc29a
add charm buff icons 2024-01-21 15:05:31 +01:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Marcel
7ecf0487f1 Merge branch 'chat-bits' into 'master'
Allow either Enter or Return for sending a message.

See merge request veloren/veloren!4247
2024-01-21 10:46:53 +00:00
Illia Denysenko
cebfb9f508 Merge branch 'timvinc/kill_npc_cmd_option' into 'master'
Fixes #1922 - Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets'

Closes #1922

See merge request veloren/veloren!4261
2024-01-21 10:27:09 +00:00
Tim Vincent
cb1a0b9f91 Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets' 2024-01-20 16:39:42 -08:00
Woeful_Wolf
3cb5132ab9 Simplified match, use filter and cargo fmt suggestions 2024-01-20 20:40:16 +02:00
Samuel Keiffer
5d6824aace Merge branch 'haniwa' into 'master'
haniwa

See merge request veloren/veloren!4234
2024-01-20 17:45:23 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Woeful_Wolf
25e4e09ab4 Fixes #1923 - Pickaxe tooltip wrong for digging 2024-01-20 19:08:41 +02:00
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00:00
Joshua Barretto
88a4d0898f Merge branch 'making-things-sprite' into 'master'
Overhauled sprite representation to support many more sprites and attributes

See merge request veloren/veloren!4259
2024-01-20 11:16:18 +00:00
Joshua Barretto
777d03b361 Categorised more sprites 2024-01-20 10:36:34 +00:00
Joshua Barretto
e5aa8cd3b7 Fix warnings 2024-01-19 20:14:32 +00:00
Joshua Barretto
5260c82c4a Overhauled sprite representation to support many more sprites and attributes 2024-01-19 18:05:56 +00:00
Maxicarlos08
e9d61c2d34
fix rule button panic 2024-01-19 16:44:43 +01:00
Joshua Barretto
b1c7c2946f Merge branch 'juliancoffee/item-i18n-followup' into 'master'
Add test that checks that all items have en i18n

See merge request veloren/veloren!4255
2024-01-16 22:36:18 +00:00