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
Sam
e4ebd17363
Addressed feedback
2023-04-06 10:57:12 -04:00
Sam
ca879173be
Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.
2023-04-06 10:56:55 -04:00
Sam
658de93c59
Repairing UI
2023-04-06 10:56:53 -04:00
Sam
0966753699
Added repair recipes
2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Sam
a555e08d0b
Added durability to item tooltips
2023-04-06 10:54:47 -04:00
Sam
df13741be9
Durability system in place
2023-04-06 10:54:46 -04:00
Christof Petig
e60aace448
realize zesterers proposal
2023-04-05 00:11:26 +02:00
Christof Petig
f4a87e9f0b
cargo fmt
2023-04-04 23:47:31 +02:00
Christof Petig
8d2b9b9a9c
single file orichalcum armor
2023-04-04 23:46:20 +02:00
Avi Weinstock
908b2a62fa
Change item color in details mode.
2023-04-03 15:40:34 -04:00
Avi Weinstock
6899023fde
Sort merchant inventories lexicographically by (quality, name, quantity)
...
in details mode.
2023-04-03 14:43:14 -04:00
Avi Weinstock
8facf7b58d
Add a list mode to inventories to make it easier to see item names at merchants.
2023-04-03 14:43:14 -04:00
Joshua Barretto
17cdd3e38d
Merge branch 'zesterer/choose-starting-site' into 'master'
...
Allow new players to choose their starting site
See merge request veloren/veloren!3848
2023-04-02 00:45:25 +00:00
Sam
6849f9fc21
Fix function name typo
2023-04-01 18:11:16 -04:00
Sam
352d34557e
Fix modular crafting window showing an item output when it is not possible to craft two components together.
2023-04-01 17:22:01 -04:00
Monty Marz
ca18da8061
UI tweaks
2023-04-01 21:54:48 +02:00
Maxicarlos08
ac377e2bbf
Hide invites comming from muted players
2023-04-01 18:45:19 +02:00
Joshua Barretto
19db823092
Proper next/prev site buttons
2023-04-01 12:34:58 +01:00
Joshua Barretto
acec45b756
Initial implementation of starting site choice
2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8
Merge branch 'more_spot_things' into 'master'
...
grave models, spot fixes, sword overlay
See merge request veloren/veloren!3842
2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed
Small fixes
2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2
grave models, spot fixes, sword overlay
2023-03-29 13:10:49 +02:00
Sam
c9af470cc7
Final tweaks
2023-03-28 20:55:21 -04:00
Sam
cdaf9e5c0e
Ability changes
2023-03-26 21:41:22 -04:00
Monty Marz
3e37586ba5
icons
2023-03-21 20:18:32 -04:00
Sam
acde417ca7
Abilities that require a particular stance will be greyed out when not in that stance.
2023-03-21 20:08:21 -04:00
Sam
3caa9dc529
Stances can now be left by interacting with the buff bar.
2023-03-21 20:03:22 -04:00
Sam
7365fcb530
Rolls cancel recover at the cost of additional energy, sitting ends active stances.
2023-03-21 20:03:15 -04:00
Monty Marz
6b5ae2b6fe
Update sword_bg.png
...
positioning, wording, more icons
positioning, first icons
2023-03-21 19:59:06 -04:00
Sam
39b30b3458
Decontextualized some sword abilities, added UI for sword skill tree.
2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe
Ability icons
2023-03-21 19:59:04 -04:00
Sam
86dfa34ec9
Cleaving stance required abilities
2023-03-21 19:59:00 -04:00
Sam
61f0b424b9
Old sword mostly torn out, new sword framework in place
2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f
Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability.
2023-03-21 19:38:18 -04:00
Sam
b376228d45
Primary and secondary abilities can now be contextual. BasicStance character state added.
2023-03-21 19:38:15 -04:00
Sam
9875008efa
Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).
2023-03-21 19:29:34 -04:00
Imbris
61cb0ad39b
Merge branch 'imbris/small-tweaks' into 'master'
...
Various small tweaks / fixes
Closes #1475
See merge request veloren/veloren!3817
2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70
Address review on 3817
2023-03-17 20:17:46 -04:00
Imbris
6b8e22d6cc
Improvements and fixes for interacting/collecting
...
* Inert entities like arrows no longer block interactions like picking
up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
since we were using this enum for two different things.
2023-03-11 21:17:27 -05:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Monty Marz
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Cat Stevens
83e4cdfe76
Allow locking camera zoom
...
Allow the camera's zoom to be locked by a keybind
or a Gameplay setting. The zoom lock
behavior can be changed between Toggle
and Auto, where Auto only locks the camera
zoom while specific movement/combat inputs
are being pressed. (closes !1528 )
A temporary fading notification is shown at the
top of the screen, informing the player of
the setting change (when the keybind is
used) or that the zoom is locked (when
the player might have forgotten the zoom
is locked, and is trying to zoom).
i18n strings are added for English and German,
but no other languages.
To implement the simplistic fading text, the
behavior was extracted into an impl
called `ChangeNotification`, where
reasons are quantified by `NotificationReason`.
2023-03-05 11:30:27 -05:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
Imbris
b9a6742ee6
Fix cursor not hiding when closing bag while both the bag and crafting window are displayed by delaying the want_grab calculation to after the crafting window is hidden
2023-02-03 00:26:49 -05:00
Isse
aefead4a31
fmt
2023-01-28 03:10:43 +01:00
Isse
d949348661
Moderator badge
2023-01-28 03:10:24 +01:00
Avi Weinstock
1cf74cecdb
Allocate the correct number of widget ids for multiplicity icons.
2023-01-19 15:06:14 -05:00
Avi Weinstock
adaf8ef6f4
Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs.
2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b
Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness.
2023-01-19 15:06:13 -05:00
