Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'a1phyr/fix_windows_build' into 'master'

Browse Source 
Fix bad specifier breaking on Windows

See merge request veloren/veloren!1648
This commit is contained in:
Ben Wallis 2020-12-17 18:33:18 +00:00
commit cc6a9f65a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/hud/img_ids.rs
View File

@ -8,8 +8,8 @@ rotation_image_ids! {
<ImageGraphic> <ImageGraphic>
indicator_mmap_small: "voxygen.element.buttons.indicator_mmap", indicator_mmap_small: "voxygen.element.buttons.indicator_mmap",
// Tooltip Test // Tooltip Test
tt_side: "voxygen/element/frames/tt_test_edge", tt_side: "voxygen.element.frames.tt_test_edge",
tt_corner: "voxygen/element/frames/tt_test_corner_tr", tt_corner: "voxygen.element.frames.tt_test_corner_tr",
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
<VoxelPixArtGraphic> <VoxelPixArtGraphic>

4
voxygen/src/menu/char_selection/ui/mod.rs
View File

@ -115,8 +115,8 @@ image_ids_ice! {
button_press: "voxygen.element.buttons.button_press", button_press: "voxygen.element.buttons.button_press",
// Tooltips // Tooltips
tt_edge: "voxygen/element/frames/tooltip/edge", tt_edge: "voxygen.element.frames.tooltip.edge",
tt_corner: "voxygen/element/frames/tooltip/corner", tt_corner: "voxygen.element.frames.tooltip.corner",
} }
} }