Isse
b7a56e895a
Only show available present modes in graphic settings
2024-02-01 12:05:06 +01:00
João Capucho
d29d22dd0a
update to wgpu 0.18
2024-01-30 00:52:49 +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
Joshua Barretto
4cbec5d93c
Interaction distance check, better text
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
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
Woeful_Wolf
3cb5132ab9
Simplified match, use filter and cargo fmt suggestions
2024-01-20 20:40:16 +02: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
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
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
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +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
Darren Salt
140f7a0871
Allow either Enter or Return for sending a message.
2024-01-08 11:10:32 +00:00
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Pybit
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +00:00
Isse
ba02d083da
Merge branch 'isse/walk-toggle' into 'master'
...
Roleplay stuff
See merge request veloren/veloren!4171
2023-12-12 19:59:58 +00:00
Isse
b60ebd4131
don't show red text when walking
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +01:00
Isse
5320f83462
configurable walking speed
2023-12-07 20:08:02 +01:00
Hrom
de42ffdfd8
fixed perforate icon not displaying
2023-12-06 23:38:22 +01:00
HEIEnthusiast
933c897450
Renamed to potion of agility, burning potion to combustion
2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8
Renamed swiftness to retreating, changed model
2023-12-05 13:09:14 -04:00
Py bit
53600a941d
Update mod.rs
2023-11-29 17:03:17 +00:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
HEIEnthusiast
bb2adfb2e5
Removed strength and regeneration potions
2023-11-27 15:16:44 -04:00
HEIEnthusiast
ac4101e70d
Changed textures, added strength pot
2023-11-27 06:25:58 -04:00
Maxicarlos08
c689708ec9
fix stat UI bug while trading
2023-11-26 20:22:59 +01:00
HEIEnthusiast
0bb74f9efe
Added swiftness and regeneration potions
2023-11-26 10:54:02 -04:00
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Sam
62464dbe11
Removed crit chance stat
2023-11-14 18:06:58 -05:00
Sam
3f19c61426
Changed buffs from using hash maps to an enum map and a slot map.
2023-11-12 12:37:28 -05:00
Christof Petig
f73f52605f
Support recipes and item images from plugins
2023-10-25 00:05:35 +02:00
Joshua Barretto
9dd5cd24d1
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
2023-10-13 11:57:49 +01:00
maxicarlos08
8a5f237e9c
Frost gigas tweaks
2023-10-08 11:35:01 +00:00
Marcel Märtens
8e95cb944d
cargo fmt after updating new toolchain
2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5
more clippy fixes in all binaries
2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee
fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support
2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c
Revert "extended clippy from quality.sh"
...
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741
extended clippy from quality.sh
2023-10-05 22:00:49 +02:00
Imbris
9c398cb06d
djust for changes in specs safety refactor
2023-09-24 23:46:59 -04:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode
2023-09-06 17:47:16 +02:00
Thomas S
4d21fbaea5
add fr translations
2023-08-29 10:14:48 +00:00
Imbris
f5445774de
Update winit to 0.28
...
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Maxicarlos08
e5e26149ed
review
2023-08-17 11:16:20 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation
2023-08-15 12:24:49 +02:00
Maxicarlos08
6a4a6bab9f
dance dance
2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction
2023-08-15 12:24:49 +02:00
Michal Sroczynski
b7c56c9057
Hud fix
2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying
2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent
2023-08-15 11:10:54 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code
...
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable
...
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState
...
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function
...
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Isse
98385b3b15
animation
2023-08-04 13:59:22 +02:00
Isse
b06960ce1c
fix interaction_text
2023-08-03 20:56:26 +02:00
Isse
5e225d7f35
add to changelog
2023-08-03 19:38:31 +02:00
Isse
a39923e4d6
digging shovel
2023-08-03 19:32:09 +02:00
DaforLynx
32f3437fb0
Combat music toggle
2023-07-30 08:10:36 +00:00
Sam
e3ad16ef47
Addressed review comments
2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf
Addressed testing feedback
2023-07-29 19:04:10 -04:00
Sam
30bafec247
Icons
2023-07-29 19:04:08 -04:00
Monty Marz
a4bfa1d242
skills_bg
2023-07-29 19:04:08 -04:00
Sam
68181e9b5b
Axe skill tree
2023-07-29 19:04:06 -04:00
Sam
93ddb36c0a
Axe skill icons
2023-07-29 19:04:06 -04:00
Sam
834a811def
Buff icons
2023-07-29 19:04:05 -04:00
Sam
188be17b95
Defiance
2023-07-29 19:04:03 -04:00
Sam
820f8dca94
Sunder
2023-07-29 19:04:02 -04:00
Sam
a2deac19ee
Furor
2023-07-29 19:03:59 -04:00
Sam
1cc99c9c4a
Fixes to animations and making ability that the animation system thinks is being used more correct
2023-07-29 19:03:56 -04:00
Sam
ff15780c22
Maelstrom
2023-07-29 18:53:48 -04:00
Sam
4a690840e4
Savage sense
2023-07-29 18:53:47 -04:00
Sam
80ab9c26ec
Initial setup
2023-07-29 18:53:38 -04:00
Samuel Keiffer
9f2ece3199
Merge branch 'remove-coin-counter' into 'master'
...
Remove coin counter at the bottom of inventories.
See merge request veloren/veloren!3998
2023-07-23 17:29:23 +00:00
Michał
29a1a7050b
Loot, foods and salvage tweaks
2023-07-19 14:16:20 +00:00
Avi Weinstock
7f06607899
Remove coin counter at the bottom of inventories.
2023-07-14 11:02:37 -04:00
Monty Marz
102945b9e7
Dungeon rework initial patch
2023-07-09 20:03:09 +00:00
Hugo Famechon
a648c68233
Sort items in inventory by quantity
2023-07-05 19:07:16 +00:00
Avi Weinstock
ced6880168
Added additional confirmation when trading for nothing.
2023-06-26 10:39:30 -04:00
Monty Marz
138e7bf0a2
Merge branch 'mkatsenelson/focused_chat_border' into 'master'
...
add focus chat borders with avarage opacity of chat and input text color
See merge request veloren/veloren!3984
2023-06-16 08:29:39 +00:00
mkatsenelson
7d39d3e30e
changing margin from 3px to 2px size
2023-06-15 09:31:36 +03:00
mkatsenelson
db5fe2210c
add focus chat borders with avarage opacity of chat and input text color
2023-06-13 11:58:48 +03:00
Imbris
a8fbfc026a
Fix compilation errors from recent changes
2023-06-04 12:58:16 -04:00
Imbris
c60f994c7f
Some random changes and a fmt
2023-06-04 12:58:16 -04:00
Imbris
4094887997
Rename UidAllocator to IdMaps everywhere, also rename lookup_entity to
...
uid_entity.
Also made more progress on changes in common/src/uid.rs
(does not compile so don't know if all rebase quirks resolved)
2023-06-04 12:58:16 -04:00
Imbris
3277d18265
Rename retrieve_entity_internal to lookup_entity
2023-06-04 12:58:16 -04:00
Imbris
ea725fffde
Cleanup UidAllocator and Uid a bit:
...
* Remove unnecessary Marker/MarkAllocator trait implementations.
* Delete excess functions
* Change some methods to take Uid instead of u64
2023-06-04 12:58:15 -04:00
flo
16d58c6b4e
plant creatures
2023-06-03 13:59:52 +00:00
Joshua Barretto
2a9e43b847
Draw distinction between bilinear filtering and nearest neighbour
2023-05-31 18:26:53 +01:00
Joshua Barretto
4fa799e7c7
Fixed volume mount orientation
2023-05-25 03:16:27 +01:00
Tao In Way
f18297ec75
taoist/charms
2023-05-19 03:07:44 +00:00
flo666
0ba58d8785
map icon fix & set difficulty indicator to 2
2023-05-13 09:32:28 -04:00
flo666
c7831a8ca9
loot_tables yeti&elder ,
...
change drum to wildskin_drum,
add map icons,
yeti attacks buff
2023-05-13 09:32:27 -04:00
flo666
7739aaff78
add more loot
2023-05-13 09:32:24 -04:00
flo666
715a0b7b20
rebase
2023-05-13 09:30:50 -04:00
jshipsey
da3c2369e5
initial setup
2023-05-13 09:30:13 -04:00
Joshua Barretto
9e9889eed6
Allowed bird pets to mount their owners when nearby
2023-05-12 21:03:44 +01:00
Isse
b4c3868dd4
different translation key for mounting Helm
2023-05-09 19:43:10 +02:00
Isse
a6665ed988
some comments
2023-05-09 19:43:10 +02:00
Isse
192356f6c5
use interpolated pos and ori
2023-05-09 19:43:09 +02:00
Isse
134d0f0c04
varius fixes
2023-05-09 19:43:09 +02:00
Isse
6674cce2cc
intercat with sprites on ships
2023-05-09 19:43:09 +02:00
Isse
d292234c47
lod for sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
7eba16a2d7
use mount key
2023-05-09 19:43:08 +02:00
Isse
2928eb8d15
sit on sprites
2023-05-09 19:43:08 +02:00
Sam
a38f336c9e
Added dual wielding sword contextual abilities.
2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87
Dual wielding weapons of the same kind added as a context
2023-05-07 20:43:51 -04:00
Sam
9cedf854de
Abilities can now be activated from multiple contexts
2023-05-07 20:43:50 -04:00
Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Isse
44bf8f19f1
combine into one filter_map
2023-05-03 16:29:56 +02:00
Isse
922ba9ed5c
add note about using threshold for subtitle duration
2023-05-03 16:15:28 +02:00
Isse
77b7d1a49e
localize after distance filter
2023-05-03 16:10:14 +02:00
Isse
54a7367cb2
Maintain all subtitles, limit calls to state.update
2023-05-03 13:07:36 +02:00
Isse
f60c44d812
nicer ui
2023-05-03 13:07:36 +02:00
Isse
99463a37f8
subtitles
2023-05-03 13:07:35 +02:00
Isse
1c9b502f69
move flashing lights to accessability settings tab
2023-05-03 13:07:35 +02:00
Isse
ab4076518f
Add multiloot
2023-04-23 19:17:39 +00:00
ubruntu
b53bfd4246
Hide display name of mount while mounted (at full hp)
2023-04-22 18:13:13 +00:00
Sam
e819cd2309
Updated hashbrown, removed some to_owned calls in handling recently unequipped items
2023-04-19 18:43:40 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -04:00
Joshua Barretto
9e17042bf6
Merge branch 'rtsim2' into 'master'
...
Initial implementation of rtsim2
Closes #1476
See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Joshua Barretto
3582d86c70
Simplified localisation logic
2023-04-11 23:51:07 +01:00
Joshua Barretto
edcc2f1870
Overhauled chat message representation to allow for more exhaustive localisation
2023-04-11 15:46:36 +01:00
Imbris
4ea635cc8d
Merge branch 'imbris/random-tweaks-35902u8' into 'master'
...
Some misc tweaks
See merge request veloren/veloren!3861
2023-04-11 02:07:35 +00:00
Joshua Barretto
5aaee96cb1
Removed special-casing of merchants
2023-04-09 19:25:56 +01:00
Joshua Barretto
364255c7fe
Allowed rtsim NPCs to greet nearby actors
2023-04-09 19:25:55 +01:00
Isse
d53b344c23
make merchants use tell, and general cleanup
2023-04-09 19:25:55 +01:00
Joshua Barretto
b022076a5c
Fallback for non-trades
2023-04-09 19:25:55 +01:00
Imbris
54c39c03f7
Merge branch 'imbris/pixel-perfection-v2' into 'master'
...
Move image scaling into the UI shaders rather than precomputing it on the CPU
Closes #257
See merge request veloren/veloren!3573
2023-04-08 07:06:19 +00:00
Imbris
9cdfb6a4aa
Resolve some remaining TODOs for ui image processing changes
...
* Explicitly assert that neither of the requested dimensions for an
image are 0. (I think this used to fail later on anyway)
* Don't show the UI alpha premultiply pass in GPU timings in the HUD
debug info display since it only very transiently appears (since this
doesn't run every frame).
2023-04-08 00:29:29 -04:00
Imbris
e20cf5f14f
Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs
2023-04-07 01:59:41 -04:00
Samuel Keiffer
162509e1c9
Merge branch 'sam/durability' into 'master'
...
Durability
See merge request veloren/veloren!3509
2023-04-06 22:42:52 +00:00
Hudson
e03406b103
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 13:43:11 -05:00
Hudson
4881d2fd8b
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 12:40:08 -05:00
Monty Marz
29a7520a48
adjusted death message, fixed repair bench text
2023-04-06 10:57:17 -04:00
Sam
132f26dbc0
Addressed review
2023-04-06 10:57:16 -04:00
Sam
00710a4eb0
Fixed csv tools
2023-04-06 10:57:13 -04:00
