Commit Graph

1324 Commits

Author SHA1 Message Date
Andrzej Drabarek
fa5555a348 Fixed Tutorial HUD being covered up by other HUD elements. 2022-03-20 19:05:10 +01:00
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