Monty Marz
c3f92622c1
bg icons
2022-05-16 15:11:29 -04:00
Sam
fceb48c3ac
Removed vec allocation for component recipe iterators
2022-05-16 15:11:26 -04:00
Sam
a5a517916e
Initial UI including ingredients in crafting modular components
2022-05-16 15:11:25 -04:00
Sam
085b18c07a
Formatting tweaks to tooltips
2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190
modular component tooltips
2022-05-16 15:11:25 -04:00
Sam
d436362a8d
Consolidated crafting UI for the primnary component of modular weapons.
2022-05-16 15:11:21 -04:00
Sam
aeac0f5ad6
Modular inputs now have tooltips.
2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d
Ui
2022-05-16 15:11:18 -04:00
Sam
360e12be22
UI can display a preview of the modular weapon output.
2022-05-16 15:11:17 -04:00
Sam
8fc0138e84
Initial crafting UI for modular weapons.
2022-05-16 15:11:17 -04:00
Sam
bf348b7f43
Addressed further review.
2022-05-16 15:11:16 -04:00
Sam
94c19735ca
Fixed broken stuff during rebase.
2022-05-16 15:11:16 -04:00
Sam
81c83c5e83
Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS
2022-05-16 15:11:15 -04:00
Sam
524845b661
Addressed more comments on MR.
2022-05-16 15:11:15 -04:00
Sam
259db56ca6
Addressed more comments in MR review.
2022-05-16 15:11:14 -04:00
Sam
a9e9a70687
Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS
2022-05-16 15:11:11 -04:00
Sam
b048179c0a
Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.
2022-05-16 15:11:11 -04:00
Sam
08b7bb781f
Changed Item to have ItemBase instead of ItemDef. NO ASSETS.
2022-05-16 15:11:10 -04:00
Sam
5bacf526ad
Began addressing initial review of modular weapons.
2022-05-16 15:11:10 -04:00
Sam
2aad3f3961
Switched to item list as an input for modular components so that allowed items could be centralized.
2022-05-16 15:11:08 -04:00
Sam
0a38567e8d
Modular weapons can now be properly displayed in the inventory.
2022-05-16 15:10:57 -04:00
Sam
762b3be3c3
Modular weapons can now be dropped as loot or assigned to enemies.
2022-05-16 15:10:56 -04:00
Sam
c01fe655f1
Added wood
2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf
Quality is now propogated through modular items from the quality of the components.
2022-05-16 15:10:55 -04:00
Monty Marz
c5b79021f8
Fix wrapping for ingredients text
2022-05-16 15:10:54 -04:00
Sam
405b9b2448
Modular weapons now have programmatically generated names.
2022-05-16 15:10:53 -04:00
Sam
4e89bc7485
Added test functions to assist in fixing unit tests that broke from changed functionality.
2022-05-16 15:10:52 -04:00
Sam
6620c1dd1f
Added HandsKind to automatically resolve handedness of modular weapons.
2022-05-16 15:10:51 -04:00
Sam
85b7382487
Added handedness requirements to recipes and components.
2022-05-16 15:10:50 -04:00
Sam
77934c9214
Made changes to crafting to allow modular weapons to work as intended.
2022-05-16 15:10:48 -04:00
IsseW
bd53d0b354
fix wrong spelling
2022-05-16 00:06:57 +02:00
IsseW
fb7aa07b01
site command completion
2022-05-15 23:57:21 +02:00
Cheuk Yin Ng
0962d3d67e
Add chat window opacity value alongside slider
2022-05-15 08:30:30 -07:00
holychowders
be0e322219
Remove "(Items)" from stealth stat descriptions.
2022-05-14 09:34:57 -05:00
holychowders
63f829be66
Add icon to stealth stat in Bag UI.
...
- Thanks to Toaster for making the icon.
2022-05-12 20:28:23 -05:00
holychowders
ff905fab95
Add stealth stat to Bag UI. NOTE: Needs icon.
2022-05-12 20:26:43 -05:00
Joshua Barretto
e02f8aee65
Merge branch 'zesterer/lod-objects' into 'master'
...
LoD Objects (inc. Trees)
See merge request veloren/veloren!3367
2022-05-11 14:56:12 +00:00
Joshua Barretto
c7e51a6c59
Added frustum culling for LoD objects
2022-05-10 16:21:14 +01:00
Joshua Barretto
f35c98d1a1
Added LoD distance setting
2022-05-10 12:40:06 +01:00
holychowders
1ebbf335e1
Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve.
2022-05-06 19:25:03 -05:00
holychowders
dc9dbc30b4
- Adjust Stats Diary UI to show stealth as a percentage from armor items.
...
- `(Max)` is also shown when stealth from items is maxed out (currently
30%).
Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
- In addition, the current max stealth sum from armor is `0.3`, beyond which no stealth effect is caused.
2022-05-06 13:15:46 -05:00
Marcel Märtens
697673bcca
update toolchain to nightly-2022-04-25
2022-05-03 15:22:28 +02:00
Anton Katsuba
d37db03270
Fixed an error where '{amount} Exp' floater was displayed only in English despite localizations being available
2022-04-19 18:28:15 +03:00
Marcel Märtens
64b9602760
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f
update a bunch of dependencies, including clap3
2022-04-04 11:43:29 +02:00
jh0l
585bcda729
fix: 🐛 resolve issue where client spams TradeAction updates based on out of sync PendingTrade values
2022-03-27 20:25:22 +02:00
jh0l
32d4ddd4fd
style: 🎨 remove newline
2022-03-27 20:25:20 +02:00
Jack hollis-london
aeae94d31b
small refactor per code review
2022-03-27 20:25:19 +02:00
jh0l
403a523ec7
refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade
2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:21 +02:00
jh0l
991cfcaa47
feat: 🌐 add i18n for trade amount input placeholder
2022-03-27 20:24:20 +02:00
jh0l
6f22f31376
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:18 +02:00
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
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
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
da677e8ea6
Abilities can now be referred to by the asset id.
2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b
Did voxygen stuff for ability pool.
2021-11-09 21:20:41 -05:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
Sam
15a8c31383
Hack to make salvage go away when leaving station.
2021-10-29 13:25:38 -04:00
Kali
768911aebe
tweak chat scroll issue
2021-10-28 02:55:38 -07:00
Sam
4b9e9c506b
Fixed opening salvaging station not showing salvage text.
2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496
crafting station model, explanatory text part 1
2021-10-27 17:02:34 -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
Snowram
2bf16aab63
Make item tooltip accept multiple items for salvage
2021-10-27 17:02:33 -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
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
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
