Benoît du Garreau
f36e74e383
Fix deprecated function use
2022-05-28 23:53:30 +02:00
Benoît du Garreau
ca2ef3e813
Add comments
2022-05-28 23:32:16 +02:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager
to 0.8.0
and image
to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Ben Wallis
d56e0de392
Merge branch 'xvar/fix-charselect-bug' into 'master'
...
Fixed handling of deleted characters on character select screen
Closes #1560
See merge request veloren/veloren!3408
2022-05-28 18:12:49 +00:00
Ben Wallis
c001de7409
Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally.
2022-05-28 16:28:26 +01:00
Ben Wallis
34f580dfaa
Introduced loot ownership rules to combat loot stealing by players
...
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f
Skiing and ice skating
2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Imbris
5cf899c4fe
Plot fixes in client and dynamic name fix in voxygen (tracy update)
2022-05-26 22:19:11 -04:00
Imbris
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
Marcel
fb6a8e0360
Merge branch 'xMAC94x/network_error' into 'master'
...
Pass network errors through the stack to display them in logs
See merge request veloren/veloren!3385
2022-05-25 22:12:42 +00:00
Samuel Keiffer
b9c324a183
Merge branch 'tame_and_mount_special_casing' into 'master'
...
Special case taming and mounting.
See merge request veloren/veloren!3354
2022-05-24 02:09:45 +00:00
N A
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
Corvella
a9622fe28e
Add a setting to toggle zooming in when charging bow
2022-05-23 23:09:47 +00:00
Marcel Märtens
fc735f509e
fix a unrelated clippy issue that came up suddenly
2022-05-23 09:20:54 +02:00
Imbris
50c34e56ce
Merge branch 'chucksys/chat-opacity-text' into 'master'
...
Add chat window opacity value alongside slider
See merge request veloren/veloren!3377
2022-05-19 03:48:20 +00:00
Sam
534c7dc8b9
Simplified item key (no assets)
2022-05-18 16:28:06 -04:00
Sam
46fe8604b7
Added search filtering to modular entries in crafting UI
2022-05-16 15:11:46 -04:00
Sam
066b8ef9fd
Address feedback (no assets)
2022-05-16 15:11:43 -04:00
Sam
85c2a85817
Addressed review comments
2022-05-16 15:11:42 -04:00
Sam
13ea6dee93
Addressed second round of balance feedback (assets).
2022-05-16 15:11:40 -04:00
Sam
c0dd748bc7
Addressed second round of balance feedback (no assets).
2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1
Addressed playtest feedback (no assets).
2022-05-16 15:11:39 -04:00
Sam
1b85258838
Crafting slots now properly check component recipe book to see if an input is valid.
2022-05-16 15:11:35 -04:00
Sam
64d07d02c4
Changed item definition id to better handle modular items.
2022-05-16 15:11:34 -04:00
Sam
37442b638c
Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets).
2022-05-16 15:11:33 -04:00
Sam
afd2c8730f
Addressed most review comments (no assets).
2022-05-16 15:11:32 -04:00
Bryant Deters
777fcdf477
closing crafting menu clears crafting components in modular recipe [ci_skip]
2022-05-16 15:11:31 -04:00
Bryant Deters
cabde522b0
cleanup commented line [ci_skip]
2022-05-16 15:11:31 -04:00
Bryant Deters
0d4b05b256
text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip]
2022-05-16 15:11:30 -04:00
Sam
f6bf8206ab
Use new icons from Pfau
2022-05-16 15:11:30 -04:00
Monty Marz
c3f92622c1
bg icons
2022-05-16 15:11:29 -04:00
Sam
fceb48c3ac
Removed vec allocation for component recipe iterators
2022-05-16 15:11:26 -04:00
Sam
a5a517916e
Initial UI including ingredients in crafting modular components
2022-05-16 15:11:25 -04:00
Sam
085b18c07a
Formatting tweaks to tooltips
2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190
modular component tooltips
2022-05-16 15:11:25 -04:00
Sam
d436362a8d
Consolidated crafting UI for the primnary component of modular weapons.
2022-05-16 15:11:21 -04:00
Sam
5877334ed3
Tags are now generated for modular items.
2022-05-16 15:11:20 -04:00
Sam
aeac0f5ad6
Modular inputs now have tooltips.
2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d
Ui
2022-05-16 15:11:18 -04:00
Sam
360e12be22
UI can display a preview of the modular weapon output.
2022-05-16 15:11:17 -04:00
Sam
8fc0138e84
Initial crafting UI for modular weapons.
2022-05-16 15:11:17 -04:00
Sam
bf348b7f43
Addressed further review.
2022-05-16 15:11:16 -04:00
Sam
94c19735ca
Fixed broken stuff during rebase.
2022-05-16 15:11:16 -04:00
Sam
81c83c5e83
Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS
2022-05-16 15:11:15 -04:00
Sam
524845b661
Addressed more comments on MR.
2022-05-16 15:11:15 -04:00
Sam
259db56ca6
Addressed more comments in MR review.
2022-05-16 15:11:14 -04:00
Sam
a9e9a70687
Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS
2022-05-16 15:11:11 -04:00
Sam
b048179c0a
Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.
2022-05-16 15:11:11 -04:00
Sam
08b7bb781f
Changed Item to have ItemBase instead of ItemDef. NO ASSETS.
2022-05-16 15:11:10 -04:00