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
Samuel Keiffer
7cf5bc4bb7
Merge branch 'sam/rename-poise-stat' into 'master'
...
Renamed poise_strength to effect_power to allow it to be used more generally...
See merge request veloren/veloren!2589
2021-07-11 15:13:00 +00:00
Dr. Dystopia
01a118efc5
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02:00
Sam
fbcc774911
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-10 23:22:00 -05:00
Knightress Paladin
42c3872528
Added healing aura duration skill to voxygen UI
2021-07-10 20:02:36 -07:00
Samuel Keiffer
351a68944b
Merge branch 'juliancoffee/skill_truth' into 'master'
...
Move skill boost modifiers to skills module
See merge request veloren/veloren!2540
2021-07-09 23:05:48 +00:00
Jonathan Berglin
00434b25c0
Replace deprecated constant in 'chat'
2021-07-09 21:00:15 +00:00
Caleb
ffeb936601
Prevent chat from scrolling with new messages if not already at the bottom to allow players to read history
2021-07-08 20:01:07 -05:00
Dr. Dystopia
7ded50a668
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
2021-07-08 16:38:27 +02:00
Monty Marz
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
67f22baed5
Add support for splicing numbers into skill desc
2021-07-07 17:51:30 +03:00
juliancoffee
d4c61ae2f3
(voxygen) Better support for multibuff items
...
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
2021-07-05 10:56:29 +03:00
Jonathan Berglin
fc618b2222
Extract 'create_new_button' function from 'update'
2021-07-01 14:39:02 +00:00
Sam
1978b590aa
Destringified consumables
2021-06-29 05:59:02 -05:00
DrunkOnHotCoco
ea41f9ab39
Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs
2021-06-27 18:18:01 +00:00
juliancoffee
681fd37429
style
2021-06-27 02:44:19 +03:00
juliancoffee
12b5d655cf
Split Material and Dismantle crafting tabs
2021-06-26 21:37:13 +03:00
juliancoffee
123b2814cf
Sort tabs in logical sequence
2021-06-26 21:37:13 +03:00
juliancoffee
3b6d6b9393
Improve Dismantle UX
...
- Change `Any {}` to `Any {} item` so for example when you want to
dismantle something into linen, you will see `Any linen item` which
points you that you need to get some item which is made from linen, and
not some generic linen.
2021-06-26 21:37:13 +03:00
Sam
aac24ad601
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Sam
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Joshua Barretto
b84708ca75
Added chat toggle
2021-06-21 20:16:03 +01:00
Imbris
315ab872f5
add prof_span to hud elements
2021-06-19 04:27:51 -04:00
Joshua Barretto
96cbf60c3f
Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients
2021-06-17 19:55:21 +01:00
Imbris
a9229e3625
Merge branch 'imbris/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2461
2021-06-16 08:18:45 +00:00
Imbris
19f741b33f
Show the graphics backend in the hud debug info and include the adapter info when panicking in the wgpu error handler
2021-06-16 03:24:10 -04:00
Imbris
345add91db
Eliminate panics when .current_monitor() returns None
2021-06-16 01:36:59 -04:00
Imbris
1ed6a04a34
Merge branch 'zakru/fix/1193' into 'master'
...
Avoid saving settings if maps are not updating
Closes #1193
See merge request veloren/veloren!2456
2021-06-15 19:55:14 +00:00
Zakru
afc04ae22f
Fix settings not saving when zooming map with keys
2021-06-15 21:20:10 +03:00
Zakru
52c965fb6d
Avoid saving settings if maps are not updating
...
Fixes #1193
2021-06-15 21:19:52 +03:00
Snowram
84080607cd
Truncates consumables value to the first decimal place
2021-06-15 19:36:20 +02:00
Avi Weinstock
c5f82b241d
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.
2021-06-14 13:39:50 -04:00
Monty Marz
45f79059d0
mining exp sct color and icon; add mining to skill_preset
2021-06-13 14:34:42 -04:00
Avi Weinstock
9d4a65e8ac
Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.
2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa
icons and naming
2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de
Mining skill tree.
2021-06-13 14:34:42 -04:00
Forest Anderson
f578c56db7
Merge branch 'juliancoffee/small_fixes' into 'master'
...
Ranged, Tidal Warrior, spears, assets
See merge request veloren/veloren!2416
2021-06-11 17:46:56 +00:00
Cr0ss0vr
8e0891e3b1
Fix incorrect tooltip on Staff Damage skill - Update diary.rs
2021-06-11 11:59:09 +00:00
juliancoffee
edc4af8023
fix Wet debuff image
2021-06-11 01:45:02 +03:00
Marcel
f255f01ac0
Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master'
...
Extract 'get_duration_image' function from 'update'
See merge request veloren/veloren!2407
2021-06-09 14:08:38 +00:00
Dr. Dystopia
cead9a019b
Extract 'create_new_text' function from 'update'
2021-06-09 13:35:41 +02:00
Dr. Dystopia
e31cb062a2
Extract 'get_duration_image' function from 'update'
2021-06-09 13:09:31 +02:00
Snowram
279d3ade83
Item tooltip refactor and fixed related to new stats
2021-06-07 11:06:32 +02:00
Sam
0488b2fcd0
Adressed comments on energy and armor functions.
2021-06-07 11:06:25 +02:00
Snowram
76ca99ece4
Derive str from Material, better deserialization
2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155
cave adjustments
2021-06-07 11:02:34 +02:00
jshipsey
5fdb2ac01d
migration
2021-06-07 11:01:04 +02:00
Snowram
29a38e6d4f
Split tags into material class and material
2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4
Add material and armor class tags
2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7
proper recipes, tanning racks, various fixes
2021-06-07 11:00:14 +02:00
jshipsey
754b60d810
crafting stations
2021-06-07 10:59:35 +02:00
Imbris
95bfcde6d1
Remove unused velocity field in the Hud and remove unused fields from
...
the image slider widget code
2021-06-07 02:49:35 -04:00
Marcel
45741b0dbd
Merge branch 'hqurve/crafting-sorting2' into 'master'
...
Widened recipe list in crafting menu and added quality indicators to names in the list
See merge request veloren/veloren!2378
2021-06-06 15:55:11 +00:00
hqurve
39fc48ac17
Widened recipe list in crafting menu and added quality indicators to names in the list
2021-06-06 15:55:11 +00:00
Jonathan Berglin
38c0e02114
Extract 'create_unlock_skill_button' function from 'update' in diary.rs
2021-06-06 14:14:53 +00:00
Ben Wallis
059dfd2602
Merge branch 'hqurve/fix-lootscrller' into 'master'
...
Fixed loot scroller collisions and cleaned up previous changes
See merge request veloren/veloren!2358
2021-06-04 20:00:18 +00:00
