Sam
d01997ca56
Overflow slots as slots
2024-02-02 20:06:55 -05: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
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
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
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
Treeco
7496aa5357
Added LOD objects for new forest types
2024-01-31 23:01:44 +00: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
juliancoffee
ab8a7147b4
Add test that checks that all items have en i18n
2024-01-16 23:07:36 +02:00
Joshua Barretto
a852298010
Merge branch 'zesterer/better-char-select-scene' into 'master'
...
Render render LoD terrain on char select, remove old backdrop figure
See merge request veloren/veloren!4254
2024-01-16 18:51:04 +00:00
Isse
4f084506c0
Merge branch 'juliancoffee/item-i18n' into 'master'
...
Add Item i18n
Closes #903
See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
Joshua Barretto
64debe2f0b
Remove unnecessary conversion
2024-01-16 17:47:24 +00:00
juliancoffee
d3fcade857
Rename ItemL10n to ItemI18n
2024-01-16 19:14:14 +02:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
...
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
juliancoffee
db569513f3
review
2024-01-16 13:07:53 +02:00
Joshua Barretto
751df7801f
Render airship sprites in char select
2024-01-15 22:51:54 +00:00
Joshua Barretto
d51b5c5bea
Add airship to char select
2024-01-15 22:35:42 +00:00
Joshua Barretto
3420e7a227
Appease clippy
2024-01-15 19:07:19 +00:00
Joshua Barretto
5bc60f2436
Add LoD zone data to char select screen
2024-01-15 19:07:19 +00:00
Joshua Barretto
43d935a150
Render render LoD terrain on char select, remove old backdrop figure
2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +01:00
Joshua Barretto
e4dbe50f39
Tick client when in server info menu
2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server
2024-01-15 00:02:43 +01:00
juliancoffee
1748b5e76f
Final(?) step to deprecating item names
2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558
Implement item localization
...
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
try_all_item_defs() covers only items in asset folder.
Required assets will go in next commit
2024-01-14 21:25:15 +02:00
juliancoffee
18e507315f
Add ItemDesc::l10n method
...
- Add ItemL10n struct that is similar to ItemImgs except it holds i18n
description and not items. ItemDesc::l10n uses this struct to provide
common_i18n::Content for both names and descriptions.
So far it only used in voxygen, but it can be used by rtsim in
dialogues.
- Introduced new deprecation, ItemKind::Ingredient, because it uses
item.name().
It's not deleted, because it's used in inventory sorting, and our
inventory sorting is, for some reason, server-side.
- Crafting UI also still uses deprecated item.name(), because again,
sorting. It's probably will be easier to handle, because it's UI
sorting and we can use localized names here, but still, it's a thing
to discuss.
- Moved Item::describe() to voxygen/hud/util.
The most important thing to note is we don't want to completely delete
deprecated .name() and .description() along with corresponding fields
in ItemDef because ItemDef is now "public" API, exposed in plugins and I
don't want to break plugins before we actually implement i18n for them.
Otherwise, it would be basically impossible to use items in plugins.
What's left is actually fully implementing ItemDesc::l10n, create
item_l10n.ron and add fallback on current .name() and .description()
implementation.
2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a
Make sfx.ron use ItemKey
2024-01-14 21:25:15 +02:00
Darren Salt
140f7a0871
Allow either Enter or Return for sending a message.
2024-01-08 11:10:32 +00:00
Imbris
03e46de748
Merge branch 'imbris/construct-dispatcher-once' into 'master'
...
Only construct specs::Dispatcher once
See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
6c6b9181a5
Only construct specs::Dispatcher once
...
* use version of shred that has an added SendDispatcher so we can
construct the dispatcher and send it between threads (only State to
remain sendable)
* move closure for adding systems from State::tick to the creation
functions
* this does mean some voxygen systems always run instead of just in the
session state, but that should not cause issues and we can always
configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Pybit
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +00:00
Imbris
fc28629148
Convert to rgb earlier in screenshot process.
...
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00
Imbris
35fc92f872
Merge branch 'screenshot' into 'master'
...
Don't include an alpha channel when creating a screenshot file.
See merge request veloren/veloren!4222
2024-01-01 21:41:41 +00:00
Samuel Keiffer
5bd089c56d
Merge branch 'sam/remove-combo-melee' into 'master'
...
Deprecated combo melee character state
See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
Sam
8ee054a462
Fix tests
2023-12-29 11:50:18 -05:00
DaforLynx
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00