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
Sam
111abbc3bc
Added salvage tags to items, removed old salvage recipes from recipe book.
2021-10-27 17:02:29 -04: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
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
MohammadHasanKargar
1d7ba57de7
Add auto searching in crafting menu
2021-10-15 23:57:04 +03:30
Marcel
a4cf875a54
Merge branch 'isse/crafted-from-item' into 'master'
...
use "input:____" for searching by recipe input
See merge request veloren/veloren!2893
2021-10-10 15:44:44 +00:00
Isidor Nielsen
f0864a7b0a
use "input:____" for searching by recipe input
2021-10-10 15:44:43 +00:00
Marcel
94439a4240
Merge branch 'jtriantafylos/background_fps' into 'master'
...
Fixes #1350 - Allow players to cap the game FPS when unfocused
Closes #1350
See merge request veloren/veloren!2890
2021-10-10 15:33:38 +00:00
James Triantafylos
99776a6ebd
Fixes #1350 - Allow players to cap the game FPS when unfocused
2021-10-10 15:33:31 +00: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
Imbris
66076db7bb
Make map icons fade out quickly when near the edge of the map display
2021-10-06 01:37:11 -04:00
Treeco
305bdf94ef
Various map UI fixes for large worlds
...
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
2021-10-06 02:26:58 +01: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
Marcel
cea927efb6
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2021-09-24`
See merge request veloren/veloren!2862
2021-09-26 19:25:02 +00:00
Sam
c62162c2d3
Changed weights of cr calculation and exp from cr formula.
2021-09-25 21:52:20 -04:00
Samuel Keiffer
0af6969d19
Merge branch 'sam/energy-float' into 'master'
...
Changed energy to a float
See merge request veloren/veloren!2838
2021-09-25 06:51:21 +00:00
Marcel Märtens
e36eef99c8
apply some clippy fixes that comes with the new toolchain version
2021-09-24 23:18:18 +02:00
Bafon
d53d2300a6
Add setting to disable hotkey hints
2021-09-24 16:03:05 +00:00
Sam
0e5e2b46f2
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-23 14:11:09 -04:00
Marcel
d5b4c5549b
Merge branch 'bafon/crafting-station-icons' into 'master'
...
Add crafting station icon to crafting menu sidebar
See merge request veloren/veloren!2848
2021-09-22 13:54:33 +00:00
Bafon
0375b973db
Add crafting station icon to crafting menu sidebar
2021-09-22 13:54:32 +00:00
anomaluridae
51f38df169
clippy is a thing
2021-09-17 10:34:20 -07:00
anomaluridae
582f578e61
breakout interactable into seperate file
2021-09-17 10:32:06 -07:00
Monty Marz
0dfddb21b1
Merge branch 'bafon/always-show-bars-setting' into 'master'
...
Add setting to always show energy bars
See merge request veloren/veloren!2836
2021-09-15 12:04:44 +00:00
Bafon
b910c1dd9c
Add setting to always show energy bars
2021-09-15 12:04:44 +00:00
Marcel
d13391f16e
Merge branch 'bafon/map-mouse-events' into 'master'
...
Fix HUD map mouse events
See merge request veloren/veloren!2837
2021-09-14 22:19:31 +00:00
Bafon
eecab6e9ec
Fix HUD map mouse events
...
Fixes dragging, scrolling, and setting the location marker when hovering player marker, location marker, group member markers, site icons, and peaks.
2021-09-14 23:42:04 +02:00
Sam
3d31248ced
Fixed health ui in few places and xp scaling from health.
2021-09-14 10:55:14 -04:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
b26ceb6339
Removed a few unnecessary casts.
2021-09-13 10:41:55 -04:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Monty Marz
a23433b402
Bloom settings
2021-09-08 09:50:37 +00:00
juliancoffee
24569b544a
Rewrite multiplier_to_percentage to return f32
2021-08-28 02:36:26 +03:00
juliancoffee
75a0ce429f
Handle some skill description in special way
2021-08-26 14:49:52 +03:00
juliancoffee
758fe19ccb
Declarative skill icons
2021-08-26 14:49:52 +03:00
juliancoffee
9211b4a00a
Inline skills::Boost to voxygen code
2021-08-26 14:49:52 +03:00
juliancoffee
74183ae5ec
Inline redundant functions
2021-08-26 14:49:52 +03:00
juliancoffee
cc8b3c188e
Split skilltree window handling per tree
2021-08-26 14:49:52 +03:00
juliancoffee
39b02411e9
Use PositionSpecifier for skill position
2021-08-26 14:49:52 +03:00
juliancoffee
9aacc33495
Inline create_new_text
2021-08-26 14:49:52 +03:00
juliancoffee
d76f65fc5a
Diary refactoring
2021-08-26 14:49:52 +03:00
Ygor Souza
54c3adf9af
Use all armor stats to calculate combat rating
...
- Added terms to account for poise (stun resistance), max energy bonus,
energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
magnitude as the other terms.
2021-08-16 19:59:54 +02:00
DanTheOne
de750e2f46
Refactor sound settings window
2021-08-14 14:24:06 +02:00
DanTheOne
9b555a52dc
Add music and sfx volume numbers
2021-08-14 12:25:21 +02:00
Xeriab Nabil
05df63dd79
Small fix for trade window headers
2021-08-12 21:56:38 +03:00
Xeriab Nabil
8ce679766a
Fixes the issue mentioned in #1278
2021-08-12 03:23:31 +03:00
Marcel
0bedfde53e
Merge branch 'trade-window-improvements' into 'master'
...
UI: Fixes and enhancements to the trading window
See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
Illia Denysenko
2a093a9991
Localization for sprite overitem (currenly only crafting stations)
2021-08-10 23:17:25 +00:00
Snowram
dddb47a385
Makes dungeons start at level 1 visually
2021-08-09 16:36:37 +02:00
Xeriab Nabil
8e7939a921
UI: Fixes and enhancements to trading window
2021-08-08 20:11:54 +03:00
Illia Denysenko
0858279810
Gliding Debug Info
2021-08-07 13:19:58 +00:00
juliancoffee
16c72b8667
Add hotkey to toggle Egui Debug
2021-08-06 22:58:36 +03:00
Xeriab Nabil
ea5de81f9b
UI: Fixes and enhancements to trading window
2021-08-06 17:11:54 +03:00
Monty Marz
a1e22df944
Merge branch 'transp---opacity-in-UI' into 'master'
...
transparency -> opacity
See merge request veloren/veloren!2714
2021-08-02 21:30:37 +00:00
Monty Marz
bceed44614
transp -> opacity
2021-08-02 22:49:10 +02:00
Dr. Dystopia
e62d903041
Add 'UpdateArgs import to 'buttons' file
2021-08-02 13:33:52 +02:00
Dr. Dystopia
323e3166f5
Create 'animation' file
2021-08-02 13:27:33 +02:00
Dr. Dystopia
dffc91045e
Move variables closer to usage in 'buttons' file
2021-08-02 13:27:28 +02:00
Imbris
89eee332c9
Replace stamina -> energy in code, i18n keys, and asset names
2021-07-31 01:34:40 -04:00
Marcel Märtens
4c0b74150d
remove some reexports
2021-07-29 22:18:34 +02:00
juliancoffee
a6b7e93854
Improve ability descriptions
2021-07-29 18:27:18 +03:00
juliancoffee
4adc045627
Added comments on PositionSpecifier usage
2021-07-28 20:03:23 +03:00
juliancoffee
4811ede2ea
Split Skillbar::update to separate stages
2021-07-28 10:33:51 +03:00
juliancoffee
930a156cab
display_shortened for keys
2021-07-28 10:33:51 +03:00
juliancoffee
034913a22d
Update skillbar ability text
2021-07-28 10:33:51 +03:00
juliancoffee
1bdab02aad
Deduplicate bar text
2021-07-28 10:33:51 +03:00
juliancoffee
e6c451ca4b
Prettify skillbar code
2021-07-28 10:33:50 +03:00
juliancoffee
e6f2dc314c
Deduplicate skillbar slots
2021-07-28 10:33:50 +03:00
Marcel Märtens
4328a45066
fixed map to zoom and drag correctly, fixed #1111
2021-07-27 01:15:06 +02:00
Imbris
d5b134e355
Merge branch 'chat-scrolling-hack' into 'master'
...
Trying to fix chat hiding behind the chat window.
See merge request veloren/veloren!2678
2021-07-26 04:41:15 +00:00
DanTheOne
18b5c1c35a
Add shortcut to toggle chat
2021-07-26 02:42:35 +02:00
Jonathan Berglin
cd2992afd3
Tygyh/resolve clippy error supressions
2021-07-25 15:35:14 +00:00
KK
f473265fb0
This little hack, tries to fix the bad Behavior hiding the chat behind the chat window.
2021-07-24 22:43:32 -07:00
Joshua Barretto
0cb524d8d6
Properly fixed command parsing
2021-07-23 17:33:31 +01:00
schnippl0r
9e3b2a20d0
Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.
2021-07-21 13:23:45 +02:00
Marcel
5f38fb3c5b
Merge branch 'juliancoffee/deduplicate_bag_hud' into 'master'
...
Deduplicate setting equipment tooltips
See merge request veloren/veloren!2644
2021-07-20 14:01:29 +00:00
Imbris
518ec1f54f
Revamp voxygen settings so that the config directory is externally specified, remove persistence of the selected logs folder, remove unused old meta.rs file from voxygen
2021-07-19 10:26:47 -04:00
juliancoffee
6f0aeecfca
Deduplicate setting equipment tooltips
2021-07-19 03:12:36 +03:00
Jonathan Berglin
b15f426ee5
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
Imbris
9c72333741
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Jonathan Berglin
121d87d87a
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
2021-07-17 18:04:01 +00:00
Samuel Keiffer
f38cde9d40
Merge branch 'knightresspaladin/healing-aura' into 'master'
...
Knightresspaladin/healing aura
See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Monty Marz
01c9d6d6d0
icon
2021-07-16 18:39:14 +02:00
Jonathan Berglin
c1c331d59e
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Dr. Dystopia
2ff74f5cc9
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
Dr. Dystopia
fdee2d4a62
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
Monty Marz
e379aacf8c
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Marcel Märtens
5f780aa0ee
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
Marcel Märtens
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
ubruntu
6bb47b447e
Replace "Player 1" with an NPC name when trading with an NPC
2021-07-11 18:27:34 +00:00
