Commit Graph

3770 Commits

Author SHA1 Message Date
voxal
41e7e25f16 Fix clippy::nonminimal-bool 2022-01-05 20:06:43 -08:00
voxal
e546a1d1a9 Allow players to see own speech bubbles. 2022-01-05 20:06:43 -08:00
Sam
2e09feb426 Tweaks to prompt dialog. 2022-01-03 19:55:06 -05:00
Sam
efbc5f9b75 UI notifying player that their skillset has been invalidated. 2022-01-03 19:55:06 -05:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Sam
64c8321626 Made skill groups remain locked if skill to unlock them not acquired. 2022-01-03 19:55:03 -05:00
Sam
c44c10718b Split skillset and skills into separate files. 2022-01-03 19:55:00 -05:00
Sam
fe45a158ed Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp. 2022-01-03 19:55:00 -05:00
DaforLynx
13e87375d6 River sounds and more 2022-01-03 22:40:31 +00:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
DoctorKompot
1cc69bbca1 fixed Pfau's turbans and manually added back mod.rs files that got deleted previously 2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry 2021-12-27 03:01:18 +02:00
DoctorKompot
ccc1bdbf1c updated the Common Quality item displays 2021-12-27 03:00:57 +02:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
DaforLynx
e44478736e Music additions 2021-12-22 11:20:34 +00:00
Joshua Barretto
3b4fa6b328 Snow for ice 2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d Slippery ice 2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3 Merge branch 'Character-editting' into 'master'
Character editing

See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
ubruntu
59cb9ea7c2 Hide empty stats on item tooltips 2021-12-20 15:07:38 +00:00
Snowram
66a5f9fded Fixes animation hot reloading (credit to Imbris) 2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16 Format 2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78 button spacing 2021-12-18 15:41:11 +01:00
Dr. Dystopia
3329a8df61 Add 'pen' icons for edit buttons 2021-12-18 15:27:14 +01:00
Dr. Dystopia
9a7cc50898 Show current equipment during editing 2021-12-18 12:35:31 +01:00
Dr. Dystopia
48fd9e877d Use 'confirm' button when finishing editing 2021-12-18 11:45:49 +01:00
Dr. Dystopia
62f9bc5059 Fix redundant pattern matching 2021-12-15 21:05:49 +01:00
Dr. Dystopia
e2f4499d45 Remove debug prints 2021-12-15 20:56:44 +01:00
IsseW
8b258e4e81 Non editable data 2021-12-15 20:40:01 +01:00
Joshua Barretto
dd95d69dc4 Fixed character editing 2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6 Begin creating character editing 2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b Update assets_manager to 0.7 2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438 Convert Armor Stats to Options 2021-12-12 00:25:35 +00:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b Resolve all '#[allow(clippy::needless_range_loop)]' error supressions 2021-12-03 10:38:30 +01:00
Dr. Dystopia
a0dfb2e8ad Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions 2021-11-30 13:57:47 +01:00
Avi Weinstock
cb4c3eb34e Bodies of water no longer contain black chunks on the voxel minimap.
The heuristic for pruning dungeon ceilings depended on detecting an
air-to-not-air edge, which was not present for chunks whose topmost
layer was water. Sampling 1 layer of the `above` block introduces such
an edge, allowing the water surface to be detected.
2021-11-29 14:39:56 -05:00
Imbris
7760210824 Remove redundant closures 2021-11-28 12:24:57 -05:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Marcel Märtens
086f9737e4 move server.voxel for airship to common 2021-11-15 16:39:39 +01:00
Joshua Barretto
b1915622b5 Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master'
Added formatting to round tooltip values for consumables to 1 decimal place

See merge request veloren/veloren!3004
2021-11-13 20:54:05 +00:00
Ben Wallis
022c1417b6 EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.

EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Ben Wallis
b4c7af1ad1 Added formatting to round tooltip values for consumables to 1 decimal place 2021-11-13 20:25:09 +00:00
Joshua Barretto
c0bf9503bd Addressed review issues, added cloning docs to BodySpec::Manifests 2021-11-13 17:20:23 +00:00
Joshua Barretto
657ac45288 Updated changelog 2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2 Arbitrary volume airships 2021-11-13 17:13:08 +00:00
Samuel Keiffer
6e57380735 Merge branch 'sam/ability-pool-and-hotbar' into 'master'
Ability pool

See merge request veloren/veloren!2996
2021-11-12 05:11:12 +00:00
Sam
b901b97191 Changed fallback ability icon. 2021-11-11 23:41:01 -05:00
Sam
040d70c750 Final fixes. 2021-11-11 23:11:17 -05:00
Sam
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519 Addressed review feedback. 2021-11-11 18:10:22 -05:00
Sam
b678f7f46e Added some client methods for changing abilities to hook into. 2021-11-11 01:55:32 -05:00
Sam
da677e8ea6 Abilities can now be referred to by the asset id. 2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Imbris
a7e1d3218f Potential fix for leak when inventory is open 2021-11-09 01:21:45 -05:00
Joshua Barretto
80c4e3de19 Merge branch 'tijnvdheuvel/newSFX' into 'master'
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX

See merge request veloren/veloren!2977
2021-11-01 21:15:35 +00:00
jshipsey
c2b7d3bb44 good hat rendering 2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5 switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac support for hollow voxels ty zesterer 2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Sam
15a8c31383 Hack to make salvage go away when leaving station. 2021-10-29 13:25:38 -04:00
tijnvdheuvel
a36106eb22 Update mod.rs missed a comma 2021-10-29 13:09:21 +00:00
tijnvdheuvel
3dbd553997 Fixed bug truffler quadruped small 2021-10-28 17:37:29 +00:00
tijnvdheuvel
d4df012835 Added mod.rs entries for truffler and Fungome 2021-10-28 13:48:22 +00:00
Samuel Keiffer
fef9fd5893 Merge branch 'sam/crafting-tweaks' into 'master'
Better salvaging and other crafting tweaks

See merge request veloren/veloren!2903
2021-10-27 21:33:21 +00:00
Snowram
02930dd2ed Uses a list for item tooltips 2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00
Sam
5707377565 Changed tooltips to take iterator. Tooltips also show original item as well as salvage output. 2021-10-27 17:02:34 -04:00
Snowram
2bf16aab63 Make item tooltip accept multiple items for salvage 2021-10-27 17:02:33 -04:00
Sam
e28ca15059 Salvaging now requires a salvaging station. 2021-10-27 17:02:33 -04:00
Monty Marz
7aae35f286 bench 2021-10-27 17:02:31 -04:00
Sam
5c3021bd0a Inventory now highlights salvageable items when in salvage mode. 2021-10-27 17:02:31 -04:00
Sam
794b072d3e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
7a17863988 Salvage works by double clicking from inventory while salvage tab in crafting is open. 2021-10-27 17:02:30 -04:00
Sam
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
IsseW
2e27f7f84a remove print 2021-10-27 23:01:41 +02:00
Joshua Barretto
30604788b9 Merge branch 'isse/loading-tip-fixes' into 'master'
Loading screen tip fixes

See merge request veloren/veloren!2961
2021-10-27 20:08:46 +00:00
Kemper
ff56804d8a Show energy reward and speed as percentages in item tooltips 2021-10-26 23:07:37 +00:00
IsseW
50d37bc2d4 run clippy 2021-10-26 01:30:27 +02:00
IsseW
3368f43a22 consider key layout 2021-10-26 00:42:30 +02:00
IsseW
047cda179f Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
Joshua Barretto
6362c0df32 Fixed non-character point lights 2021-10-25 12:00:02 +00:00
Forest Anderson
15185ef55e Merge branch 'master' into 'master'
Fixes #819 - Prevent lantern from turning off on death

Closes #819

See merge request veloren/veloren!2955
2021-10-24 21:16:34 +00:00
Q-I-U
09028f3261 Add !health.is_dead() check to renderer 2021-10-24 22:28:23 +02:00
antoniomuso
cf8d995af7 formatted some tooltips floats 2021-10-24 10:14:54 +02:00
Samuel Keiffer
f92c6fbd49 Merge branch 'ubruntu/sneakwield-state' into 'master'
Sneak with weapons drawn

See merge request veloren/veloren!2917
2021-10-18 20:27:02 +00:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Samuel Keiffer
1e61a279cc Merge branch 'kaedr/pretty_printing_error_messages' into 'master'
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)

See merge request veloren/veloren!2935
2021-10-18 03:35:03 +00:00
Samuel Keiffer
e6a4e53ef3 Merge branch 'MHK/auto_search_in_crafting_menu' into 'master'
Add auto searching in crafting menu

See merge request veloren/veloren!2932
2021-10-17 15:16:21 +00:00
MohammadHasanKargar
40073413ae Add hover effect to auto search in crafting menu 2021-10-17 15:27:27 +03:30
kaedr
cd5aa2d1d8 Fixed redundant to_string() call. 2021-10-16 20:41:13 -04:00
kaedr
c8a1d821e7 Added handling for connection errors that occur before client leaves login screen 2021-10-16 20:17:40 -04:00
kaedr
cc98ccc371 Added localization for server error message display on client 2021-10-16 20:17:38 -04:00
kaedr
eb02a4733d Fixed obfuscation of error messages caused by previous commits 2021-10-16 20:17:37 -04:00
Joshua Barretto
ef33b2e3ab Better ambiance slider 2021-10-16 15:12:07 +01:00
Joshua Barretto
3322eeb365 Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
b1a1cdde34 Fixed 'Empty' collectable sprite 2021-10-16 14:31:46 +01:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master'
Caverns

See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
MohammadHasanKargar
1d7ba57de7 Add auto searching in crafting menu 2021-10-15 23:57:04 +03:30