Commit Graph

670 Commits

Author SHA1 Message Date
Imbris
21cad12272 Merge branch 'fix-ghost-item' into 'master'
Fix ghost item when trade gets declined

Closes #1429

See merge request veloren/veloren!3117
2022-01-30 17:31:15 +00:00
Joshua Barretto
8504a8ab21 Merge branch 'ubruntu/campfire-hud' into 'master'
Show HUD for campfires

See merge request veloren/veloren!3097
2022-01-23 19:25:11 +00:00
ubruntu
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
Joshua Barretto
b8df17080d Merge branch 'infrandomness/waypoint_binding_customization' into 'master'
Add waypoint binding customization code

See merge request veloren/veloren!3122
2022-01-21 18:05:41 +00:00
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
Joshua Barretto
c0e3f0abef Merge branch 'ubruntu/chest-sprite-names' into 'master'
Fix chest display names

See merge request veloren/veloren!3125
2022-01-21 18:05:39 +00:00
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Sam
fe1db1e9e0 Can move around, so character state system runs
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
2022-01-20 15:26:35 -05:00
threadexception
2a65d4950d Fix ghost item when trade gets declined 2022-01-20 09:07:47 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Joshua Barretto
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
Joshua Barretto
043016a433 Don't try to mount unmountable entities, clippy fixes and fmt 2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
19a1a0adb2 Changed to using slot maker for ability slots 2022-01-15 21:49:25 -05:00
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -05:00
Sam
ed38272d23 Diary stats now use real values. 2022-01-15 21:46:55 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory.
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Joshua Barretto
bc7c942bc9 Fixed nametag logic bug 2022-01-07 21:54:14 +00:00
voxal
7d07598370 Move comments and turn on by default 2022-01-05 20:07:05 -08:00
voxal
e75f569014 Refactor to avoid changing overhead struct 2022-01-05 20:07:05 -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
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
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
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01: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
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Sam
15a8c31383 Hack to make salvage go away when leaving station. 2021-10-29 13:25:38 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -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
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
7a17863988 Salvage works by double clicking from inventory while salvage tab in crafting is open. 2021-10-27 17:02:30 -04: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
Imbris
26c028975e Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it 2021-10-06 02:13:02 -04:00
Snowram
91c7aef01a Merge branch 'snowram/debug_background' into 'master'
Add a background to debug infos

See merge request veloren/veloren!2858
2021-09-26 22:15:52 +00:00
Snowram
95bc6e3b58 Add a background to debug infos 2021-09-26 23:58:38 +02:00
Sam
c62162c2d3 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Bafon
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
anomaluridae
51f38df169 clippy is a thing 2021-09-17 10:34:20 -07:00