Commit Graph

328 Commits

Author SHA1 Message Date
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
64d07d02c4 Changed item definition id to better handle modular items. 2022-05-16 15:11:34 -04:00
Sam
afd2c8730f Addressed most review comments (no assets). 2022-05-16 15:11:32 -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
5877334ed3 Tags are now generated for modular items. 2022-05-16 15:11:20 -04:00
Sam
bf348b7f43 Addressed further review. 2022-05-16 15:11:16 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -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
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Olexorus
2212c3d70c Remove borrow-checker appeasing code that's no longer necessary in Rust 2021 2022-03-15 16:49:03 +01:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00: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
juliancoffee
6a0458ddf1 Move voxygen to 2021 edition 2022-01-26 15:47:39 +02:00
Imbris
7e5a3efd02 Add egui window to toggle experimental shaders. 2022-01-23 21:14:41 -05:00
Kemper
6f0f43917d Fix negative energy stat comparisons in item tooltips 2022-01-17 05:18:21 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
19a1a0adb2 Changed to using slot maker for ability slots 2022-01-15 21:49:25 -05: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
Dr. Dystopia
f4c5abf36b Resolve all '#[allow(clippy::needless_range_loop)]' error supressions 2021-12-03 10:38:30 +01:00
Dr. Dystopia
a0dfb2e8ad Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions 2021-11-30 13:57:47 +01:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Imbris
a7e1d3218f Potential fix for leak when inventory is open 2021-11-09 01:21:45 -05:00
Snowram
02930dd2ed Uses a list for item tooltips 2021-10-27 17:02:36 -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
Kemper
ff56804d8a Show energy reward and speed as percentages in item tooltips 2021-10-26 23:07:37 +00:00
antoniomuso
cf8d995af7 formatted some tooltips floats 2021-10-24 10:14:54 +02:00
Imbris
645bd03142 Make sure ui draw commands are cleared if the renderer's resolution changes 2021-10-04 18:58:28 -04:00
Imbris
4cfa6b71fc Rework scaling to never use the logical size directly from the window as it can end up being inconsistent with the rendering target size (depending on timing) 2021-10-01 01:13:15 -04:00
Imbris
44e526fbcc Merge branch 'bafon/voxel-transparency' into 'master'
Fix voxel transparency

See merge request veloren/veloren!2885
2021-09-28 04:44:29 +00:00
Bafon
efb0e859f2 Fix voxel transparency 2021-09-28 04:44:29 +00:00
Imbris
ccbdbfe6aa Make sure to regenerate textures when Ui::replace_graphic is used. 2021-09-27 23:35:14 -04: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
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
Imbris
f1c44e1f1d Remove old textures that aren't reused when calling replace_graphic 2021-09-23 21:50:37 -04: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
Ben Wallis
d665ce329d * Added new Admin Commands window to egui, including Give Items and Kits sections
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00