Commit Graph

1373 Commits

Author SHA1 Message Date
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
ubruntu
d18242a1df Fix interactable HUD 2022-02-27 21:50:07 +00:00
Imbris
e52159f638 Remove original character from game world when possessing to make persistence more robust. 2022-02-27 13:47:13 -05:00
Imbris
10803a9735 Stop using Character presence kind when possessing so that persistence doesn't get messed up. 2022-02-27 13:47:12 -05:00
Karl Werf
4dae579aca Minimap draw order fix
Minimap location marker and player indicator are no longer drawn on top of the main map if they overlap.
Minimap location marker is no longer a button.
2022-02-27 15:41:12 +01:00
Marcel
2a9f75340a Merge branch 'spanish_translation' into 'master'
apply changes from MR!2904

See merge request veloren/veloren!3224
2022-02-20 16:26:24 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Imbris
bdb10c4e14 Merge branch 'isse/minor-ux-improvements' into 'master'
Minor inventory ux improvements

Closes #1436

See merge request veloren/veloren!3157
2022-02-16 21:48:03 +00:00
Isidor Nielsen
67f2d05d3c Minor inventory ux improvements 2022-02-16 21:48:03 +00:00
ShouvikGhosh2048
d72f43190b Fixes #1452 - Prevents empty trades 2022-02-16 21:41:26 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master'
Gnarlings

See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
Sam
f30e879cf5 Clippy fixes 2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9 small UI fixes, new haste buff icon 2022-02-14 19:24:59 +01:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Imbris
ddcee8448b Merge branch 'persist_debug_checkbox' into 'master'
Persist interface debug checkbox across sessions

See merge request veloren/veloren!3147
2022-02-13 19:43:51 +00:00
Monty Marz
c7ce2b773c new icons 2022-02-12 22:46:34 +01:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
ninefox
2e902c1c5c swapped show.debug for interface.toggle_debug 2022-02-09 18:31:46 -08:00
phoenix13032005
7a1f0d9fa1 Balance update
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
2022-02-09 12:13:42 +02:00
Avi Weinstock
f3f08936d8 Decrease too-many-arguments-threshold and type-complexity-threshold. 2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
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
ninefox
e6ced0577e Persist interface debug checkbox 2022-01-25 22:47:26 -08:00
Imbris
086b4bece8 Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master'
Kalikatz/tweak to chat scroll issue

See merge request veloren/veloren!2962
2022-01-24 06:14:08 +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
Forest Anderson
7c99f6eb5e Merge branch 'unvariant/affix_remap_button' into 'master'
Affixed remap/clear button to top of control settings window

See merge request veloren/veloren!3119
2022-01-23 18:40:43 +00:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master'
Addressing criticisms

See merge request veloren/veloren!3121
2022-01-22 16:44:01 +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
Samuel Keiffer
a00ac11e25 Merge branch 'sam/fix-possess' into 'master'
Fix possession bug

See merge request veloren/veloren!3123
2022-01-21 07:40:23 +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
Joshua Barretto
4f181c936d Merge branch 'name_areas_based_on_biome' into 'master'
name_areas_based_on_biome

See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00:00
threadexception
2a65d4950d Fix ghost item when trade gets declined 2022-01-20 09:07:47 +01:00
ninefox
3e198c5195 Affixed remap/clear button 2022-01-19 17:43:08 -08:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
floppy
51356d5fad in terrain.mod.rs, return name as Option in fn name 2022-01-18 19:53:20 +01:00
floppy
fd920cea1d allow enabling/disabling biome names on map 2022-01-17 23:47:27 +01:00
floppy
a836b61190 allow enabling/disabling biome names on map 2022-01-17 23:45:51 +01:00
Joshua Barretto
3b7ea72a9c Fixed review comments 2022-01-16 21:13:13 +00: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
4d3b0736d0 Fixed bug with returning to general combat skill tree. 2022-01-15 21:49:30 -05:00
Sam
aaa33c6834 Fixed display of some stats in dary and changelog entry. 2022-01-15 21:49:29 -05:00
Sam
745cc20c66 Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode. 2022-01-15 21:49:28 -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
d1c5d3e020 If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand. 2022-01-15 21:46:56 -05:00
Sam
70d6f3a854 Scroll through all aiblities in the same pages. 2022-01-15 21:46:56 -05:00
Sam
3870688717 Pages to swap between weapon abilities. 2022-01-15 21:46:55 -05:00
Sam
ed38272d23 Diary stats now use real values. 2022-01-15 21:46:55 -05:00
Monty Marz
eb0bed39e8 stats window WIP 2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68 progress 2022-01-15 21:46:54 -05:00
Sam
714e080535 Abilities can now be dragged to slot to be equipped. 2022-01-15 21:46:53 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -05:00
Sam
ee5293c64e Abilities scrollable now. 2022-01-15 21:42:33 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -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
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
Joshua Barretto
3cba7e7f87 Merge branch 'zesterer/fix-nametags' into 'master'
Fixed nametag logic bug

See merge request veloren/veloren!3088
2022-01-07 22:38:59 +00:00
Joshua Barretto
bc7c942bc9 Fixed nametag logic bug 2022-01-07 21:54:14 +00:00
unvariant
71d2be5f76 support removing key bindings 2022-01-07 20:30:30 +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
471e75d846 cargo fmt 2022-01-05 20:06:43 -08:00
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
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
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
ubruntu
59cb9ea7c2 Hide empty stats on item tooltips 2021-12-20 15:07:38 +00: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
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
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Ben Wallis
b4c7af1ad1 Added formatting to round tooltip values for consumables to 1 decimal place 2021-11-13 20:25:09 +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